From 6a4554a6778a99e2953c6426d137166d291ef6ab Mon Sep 17 00:00:00 2001 From: Laurent Trinques Date: Fri, 17 Jul 2026 10:44:36 +0200 Subject: [PATCH] Re-enable multi-threading to load collection The name of the elements and folders of the collection are not displayed until we hover the item with the mouse. This due that QtConcurent::run was disabled at loading of collection in the goal of use QtConcurrent::run with Qt6. Run is made to run a function once. Map is made to run a fonction for each item of a sequence (what we need in this case). Remove code of run and re-enable code for map. --- .../ElementsCollection/elementscollectionmodel.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/sources/ElementsCollection/elementscollectionmodel.cpp b/sources/ElementsCollection/elementscollectionmodel.cpp index 8eeac33a6..210886e5d 100644 --- a/sources/ElementsCollection/elementscollectionmodel.cpp +++ b/sources/ElementsCollection/elementscollectionmodel.cpp @@ -25,12 +25,8 @@ #include "xmlelementcollection.h" #include "xmlprojectelementcollectionitem.h" -#include -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove + #include -#else -#include -#endif /** @brief ElementsCollectionModel::ElementsCollectionModel @@ -297,11 +293,8 @@ void ElementsCollectionModel::loadCollections(bool common_collection, this, &ElementsCollectionModel::loadingFinished); connect(watcher, &QFutureWatcher::finished, watcher, &QFutureWatcher::deleteLater); - #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + m_future = QtConcurrent::map(m_items_list_to_setUp, setUpData); - #else - qDebug() << "Help code for QT 6 or later"; - #endif watcher->setFuture(m_future); }