diff --git a/sources/ElementsCollection/elementscollectionmodel.cpp b/sources/ElementsCollection/elementscollectionmodel.cpp index d216b0f25..d041cd07a 100644 --- a/sources/ElementsCollection/elementscollectionmodel.cpp +++ b/sources/ElementsCollection/elementscollectionmodel.cpp @@ -284,9 +284,20 @@ void ElementsCollectionModel::loadCollections(bool common_collection, this, &ElementsCollectionModel::loadingProgressRangeChanged); connect(watcher, &QFutureWatcher::finished, this, &ElementsCollectionModel::loadingFinished); - connect(watcher, &QFutureWatcher::finished, - watcher, &QFutureWatcher::deleteLater); + connect( + watcher, + &QFutureWatcher::finished, + watcher, + &QFutureWatcher::deleteLater); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove m_future = QtConcurrent::map(m_items_list_to_setUp, setUpData); +#else +# if TODO_LIST +# pragma message("@TODO remove code for QT 6 or later") +# endif + qDebug() << "Help code for QT 6 or later" + << "QtConcurrent::run its backwards now...function, object, args"; +#endif watcher->setFuture(m_future); } diff --git a/sources/elementdialog.cpp b/sources/elementdialog.cpp index 6d62c75b8..310329457 100644 --- a/sources/elementdialog.cpp +++ b/sources/elementdialog.cpp @@ -28,7 +28,6 @@ #include #include #include -#include /** @brief ElementDialog::ElementDialog diff --git a/sources/qetproject.cpp b/sources/qetproject.cpp index 4d0f9448e..b4f16b8a4 100644 --- a/sources/qetproject.cpp +++ b/sources/qetproject.cpp @@ -1783,7 +1783,8 @@ void QETProject::writeBackup() # if TODO_LIST # pragma message("@TODO remove code for QT 6 or later") # endif - qDebug()<<"Help code for QT 6 or later"; + qDebug() << "Help code for QT 6 or later" + << "QtConcurrent::run its backwards now...function, object, args"; # endif #endif }