diff --git a/sources/ElementsCollection/elementscollectionmodel.cpp b/sources/ElementsCollection/elementscollectionmodel.cpp index 7e28f678e..b6432a02f 100644 --- a/sources/ElementsCollection/elementscollectionmodel.cpp +++ b/sources/ElementsCollection/elementscollectionmodel.cpp @@ -26,11 +26,8 @@ #include "xmlprojectelementcollectionitem.h" #include -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove -#include -#else #include -#endif + /** @brief ElementsCollectionModel::ElementsCollectionModel @@ -296,15 +293,9 @@ void ElementsCollectionModel::loadCollections(bool common_collection, &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); }