aboutsummaryrefslogtreecommitdiff
path: root/autotests/kconfigtest.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'autotests/kconfigtest.cpp')
-rw-r--r--autotests/kconfigtest.cpp26
1 files changed, 19 insertions, 7 deletions
diff --git a/autotests/kconfigtest.cpp b/autotests/kconfigtest.cpp
index 4657ea8d..95a87584 100644
--- a/autotests/kconfigtest.cpp
+++ b/autotests/kconfigtest.cpp
@@ -1974,18 +1974,30 @@ void KConfigTest::testXdgListEntry()
void KConfigTest::testThreads()
{
QThreadPool::globalInstance()->setMaxThreadCount(6);
- QList<QFuture<void>> futures;
// Run in parallel some tests that work on different config files,
// otherwise unexpected things might indeed happen.
- futures << QtConcurrent::run(this, &KConfigTest::testAddConfigSources);
- futures << QtConcurrent::run(this, &KConfigTest::testSimple);
- futures << QtConcurrent::run(this, &KConfigTest::testDefaults);
- futures << QtConcurrent::run(this, &KConfigTest::testSharedConfig);
- futures << QtConcurrent::run(this, &KConfigTest::testSharedConfig);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ const QList<QFuture<void>> futures = {
+ QtConcurrent::run(&KConfigTest::testAddConfigSources, this),
+ QtConcurrent::run(&KConfigTest::testSimple, this),
+ QtConcurrent::run(&KConfigTest::testDefaults, this),
+ QtConcurrent::run(&KConfigTest::testSharedConfig, this),
+ QtConcurrent::run(&KConfigTest::testSharedConfig, this),
+ };
+#else
+ const QList<QFuture<void>> futures = {
+ QtConcurrent::run(this, &KConfigTest::testAddConfigSources),
+ QtConcurrent::run(this, &KConfigTest::testSimple),
+ QtConcurrent::run(this, &KConfigTest::testDefaults),
+ QtConcurrent::run(this, &KConfigTest::testSharedConfig),
+ QtConcurrent::run(this, &KConfigTest::testSharedConfig),
+ };
+#endif
+
// QEXPECT_FAIL triggers race conditions, it should be fixed to use QThreadStorage...
// futures << QtConcurrent::run(this, &KConfigTest::testDeleteWhenLocalized);
// futures << QtConcurrent::run(this, &KConfigTest::testEntryMap);
- for (QFuture<void> f : std::as_const(futures)) {
+ for (QFuture<void> f : futures) {
f.waitForFinished();
}
}