Drop Qt 5 support
Qt 6 has been available for almost 4 years. Qt 5 is no longer officially supported by Qt for opensource, it's time to drop Qt 5.
This commit is contained in:
@@ -243,11 +243,7 @@ void DeviceProperties::UpdateFormats() {
|
||||
// Get the device's supported formats list. This takes a long time and it blocks, so do it in the background.
|
||||
supported_formats_.clear();
|
||||
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||
QFuture<bool> future = QtConcurrent::run(&ConnectedDevice::GetSupportedFiletypes, device, &supported_formats_);
|
||||
#else
|
||||
QFuture<bool> future = QtConcurrent::run(std::bind(&ConnectedDevice::GetSupportedFiletypes, device, &supported_formats_));
|
||||
#endif
|
||||
QFutureWatcher<bool> *watcher = new QFutureWatcher<bool>();
|
||||
QObject::connect(watcher, &QFutureWatcher<bool>::finished, this, &DeviceProperties::UpdateFormatsFinished);
|
||||
watcher->setFuture(future);
|
||||
|
||||
Reference in New Issue
Block a user