summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/mimetypes
diff options
context:
space:
mode:
authorVitaly Fanaskov <vitaly.fanaskov@qt.io>2020-02-26 15:22:40 +0100
committerVitaly Fanaskov <vitaly.fanaskov@qt.io>2020-03-11 14:46:25 +0100
commitc977e74afd18afff8729070f631e6b7a3f2887f5 (patch)
tree08be91368aaee6391e1fcb71f67f90708f7b9e7a /tests/auto/corelib/mimetypes
parent01bacdf7abb071198d843acdfb22ce1701766be8 (diff)
QtConcurrent::run: accept more then five function's arguments
[ChangeLog][Potentially Source-Incompatible Changes] QtConcurrent::run has the following signatures: run(Function &&f, Args &&...args) and run(QThreadPool *pool, Function &&f, Args &&...args). If f is a member pointer, the first argument of args should be an object for which that member is defined (or a reference, or a pointer to it). See the documentation for more details. Fixes: QTBUG-82383 Change-Id: I18f7fcfb2adbdd9f75b29c346bd3516304e32d31 Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io> Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'tests/auto/corelib/mimetypes')
-rw-r--r--tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
index 7e3642752e..3c6da506e2 100644
--- a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
+++ b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
@@ -852,14 +852,14 @@ void tst_QMimeDatabase::fromThreads()
QThreadPool tp;
tp.setMaxThreadCount(20);
// Note that data-based tests cannot be used here (QTest::fetchData asserts).
- QtConcurrent::run(&tp, this, &tst_QMimeDatabase::mimeTypeForName);
- QtConcurrent::run(&tp, this, &tst_QMimeDatabase::aliases);
- QtConcurrent::run(&tp, this, &tst_QMimeDatabase::allMimeTypes);
- QtConcurrent::run(&tp, this, &tst_QMimeDatabase::icons);
- QtConcurrent::run(&tp, this, &tst_QMimeDatabase::inheritance);
- QtConcurrent::run(&tp, this, &tst_QMimeDatabase::knownSuffix);
- QtConcurrent::run(&tp, this, &tst_QMimeDatabase::mimeTypeForFileWithContent);
- QtConcurrent::run(&tp, this, &tst_QMimeDatabase::allMimeTypes); // a second time
+ QtConcurrent::run(&tp, &tst_QMimeDatabase::mimeTypeForName, this);
+ QtConcurrent::run(&tp, &tst_QMimeDatabase::aliases, this);
+ QtConcurrent::run(&tp, &tst_QMimeDatabase::allMimeTypes, this);
+ QtConcurrent::run(&tp, &tst_QMimeDatabase::icons, this);
+ QtConcurrent::run(&tp, &tst_QMimeDatabase::inheritance, this);
+ QtConcurrent::run(&tp, &tst_QMimeDatabase::knownSuffix, this);
+ QtConcurrent::run(&tp, &tst_QMimeDatabase::mimeTypeForFileWithContent, this);
+ QtConcurrent::run(&tp, &tst_QMimeDatabase::allMimeTypes, this); // a second time
QVERIFY(tp.waitForDone(60000));
}