realAscot/qelectrotech-source-mirror
realAscot/qelectrotech-source-mirror
1
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-09-13 20:23:04 +02:00
Code Packages Releases 1 Activity

[QT6] QtConcurrent its backwards now...function, object, args

Browse Source
This commit is contained in:
Simon De Backer 2021-03-07 19:58:49 +01:00
parent 38a825865c
commit 332d978043
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sources/ElementsCollection/elementscollectionmodel.cpp
View File

@ -284,9 +284,20 @@ void ElementsCollectionModel::loadCollections(bool common_collection,
this, &ElementsCollectionModel::loadingProgressRangeChanged);
connect(watcher, &QFutureWatcher<void>::finished,
this, &ElementsCollectionModel::loadingFinished);
connect(watcher, &QFutureWatcher<void>::finished,
watcher, &QFutureWatcher<void>::deleteLater);
connect(
watcher,
&QFutureWatcher<void>::finished,
watcher,
&QFutureWatcher<void>::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);
}

1
sources/elementdialog.cpp
View File

@ -28,7 +28,6 @@
#include <QPushButton>
#include <QTreeView>
#include <QVBoxLayout>
#include <QtConcurrent>
/**
@brief ElementDialog::ElementDialog

3
sources/qetproject.cpp
View File

@ -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
}