diff options
Diffstat (limited to 'tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp')
| -rw-r--r-- | tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp | 24 |
1 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 4ad09203ac..3c6da506e2 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp +++ b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp @@ -73,12 +73,12 @@ static inline QString testSuiteWarning() str << "\nCannot find the shared-mime-info test suite\nstarting from: " << QDir::toNativeSeparators(QDir::currentPath()) << "\n" "cd " << QDir::toNativeSeparators(QStringLiteral("tests/auto/corelib/mimetypes/qmimedatabase")) << "\n" - "wget http://cgit.freedesktop.org/xdg/shared-mime-info/snapshot/Release-1-10.zip\n" - "unzip Release-1-10.zip\n"; + "wget https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/Release-1-10/shared-mime-info-Release-1-10.zip\n" + "unzip shared-mime-info-Release-1-10.zip\n"; #ifdef Q_OS_WIN - str << "mkdir testfiles\nxcopy /s Release-1-10 s-m-i\n"; + str << "mkdir testfiles\nxcopy /s shared-mime-info-Release-1-10 s-m-i\n"; #else - str << "ln -s Release-1-10 s-m-i\n"; + str << "ln -s shared-mime-info-Release-1-10 s-m-i\n"; #endif return result; } @@ -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)); } |