diff options
author | Liang Qi <liang.qi@qt.io> | 2016-09-21 08:50:26 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-09-21 09:11:02 +0200 |
commit | eaec2b664aa2c3cbca13b425901888468a4652a1 (patch) | |
tree | 93dbd19f3b538baa81dec6c04e5258161f7d8cfb /tests/auto/corelib | |
parent | 278e557ceacbe7de728987a4a5365f78e56d76b1 (diff) | |
parent | 31c251765db45a068f1268027e5dd600151af1e5 (diff) |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/gui/painting/qcoregraphics.mm
src/network/access/qnetworkrequest.h
src/plugins/platforms/cocoa/qcocoahelpers.mm
Change-Id: I81266414c06ea2edf63cbc7e93a86bd5d66a31a5
Diffstat (limited to 'tests/auto/corelib')
-rw-r--r-- | tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp | 23 | ||||
-rw-r--r-- | tests/auto/corelib/tools/qstringlist/tst_qstringlist.cpp | 1 |
2 files changed, 12 insertions, 12 deletions
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp index 9e369792f1..2cf9ea4913 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp +++ b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp @@ -41,7 +41,6 @@ #include <QtCore/QStandardPaths> #include <QtCore/QTemporaryDir> #include <QtCore/QTextStream> -#include <QFutureSynchronizer> #include <QtConcurrent/QtConcurrentRun> #include <QtTest/QtTest> @@ -844,18 +843,18 @@ void tst_QMimeDatabase::findByFile() void tst_QMimeDatabase::fromThreads() { - QThreadPool::globalInstance()->setMaxThreadCount(20); + QThreadPool tp; + tp.setMaxThreadCount(20); // Note that data-based tests cannot be used here (QTest::fetchData asserts). - QFutureSynchronizer<void> sync; - sync.addFuture(QtConcurrent::run(this, &tst_QMimeDatabase::mimeTypeForName)); - sync.addFuture(QtConcurrent::run(this, &tst_QMimeDatabase::aliases)); - sync.addFuture(QtConcurrent::run(this, &tst_QMimeDatabase::allMimeTypes)); - sync.addFuture(QtConcurrent::run(this, &tst_QMimeDatabase::icons)); - sync.addFuture(QtConcurrent::run(this, &tst_QMimeDatabase::inheritance)); - sync.addFuture(QtConcurrent::run(this, &tst_QMimeDatabase::knownSuffix)); - sync.addFuture(QtConcurrent::run(this, &tst_QMimeDatabase::mimeTypeForFileWithContent)); - sync.addFuture(QtConcurrent::run(this, &tst_QMimeDatabase::allMimeTypes)); // a second time - // sync dtor blocks waiting for finished + 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 + QVERIFY(tp.waitForDone(60000)); } #ifndef QT_NO_PROCESS diff --git a/tests/auto/corelib/tools/qstringlist/tst_qstringlist.cpp b/tests/auto/corelib/tools/qstringlist/tst_qstringlist.cpp index 0fdafd9b01..2385aa992c 100644 --- a/tests/auto/corelib/tools/qstringlist/tst_qstringlist.cpp +++ b/tests/auto/corelib/tools/qstringlist/tst_qstringlist.cpp @@ -341,6 +341,7 @@ void tst_QStringList::join() const QFETCH(QString, expectedResult); QCOMPARE(input.join(separator), expectedResult); + QCOMPARE(input.join(QLatin1String(separator.toLatin1())), expectedResult); } void tst_QStringList::join_data() const |