mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2025-12-19 14:50:53 +01:00
[QT6] QtConcurrent its backwards now...function, object, args
This commit is contained in:
@@ -284,9 +284,20 @@ void ElementsCollectionModel::loadCollections(bool common_collection,
|
|||||||
this, &ElementsCollectionModel::loadingProgressRangeChanged);
|
this, &ElementsCollectionModel::loadingProgressRangeChanged);
|
||||||
connect(watcher, &QFutureWatcher<void>::finished,
|
connect(watcher, &QFutureWatcher<void>::finished,
|
||||||
this, &ElementsCollectionModel::loadingFinished);
|
this, &ElementsCollectionModel::loadingFinished);
|
||||||
connect(watcher, &QFutureWatcher<void>::finished,
|
connect(
|
||||||
watcher, &QFutureWatcher<void>::deleteLater);
|
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);
|
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);
|
watcher->setFuture(m_future);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -28,7 +28,6 @@
|
|||||||
#include <QPushButton>
|
#include <QPushButton>
|
||||||
#include <QTreeView>
|
#include <QTreeView>
|
||||||
#include <QVBoxLayout>
|
#include <QVBoxLayout>
|
||||||
#include <QtConcurrent>
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@brief ElementDialog::ElementDialog
|
@brief ElementDialog::ElementDialog
|
||||||
|
|||||||
@@ -1783,7 +1783,8 @@ void QETProject::writeBackup()
|
|||||||
# if TODO_LIST
|
# if TODO_LIST
|
||||||
# pragma message("@TODO remove code for QT 6 or later")
|
# pragma message("@TODO remove code for QT 6 or later")
|
||||||
# endif
|
# 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
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user