diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2020-05-29 10:19:43 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2020-05-29 11:41:44 +0000 |
commit | 49a54f5d20a7d49277d3d0ae4d3ff0cea457bf70 (patch) | |
tree | 38937bf6d402abaa2d359e40194ed20e2697750c /tests/auto/blackbox/tst_blackboxqt.cpp | |
parent | 65eb5b2b2b4aa67052d959a207d97c1987be1cb3 (diff) |
Fix TestBlackboxExamples for environments without Qt
The same way as TestBlackboxQt does.
Change-Id: Ic040eb3d4c0f5946ca24978090bf342121280260
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'tests/auto/blackbox/tst_blackboxqt.cpp')
-rw-r--r-- | tests/auto/blackbox/tst_blackboxqt.cpp | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/tests/auto/blackbox/tst_blackboxqt.cpp b/tests/auto/blackbox/tst_blackboxqt.cpp index 595a173a2..f77509b4d 100644 --- a/tests/auto/blackbox/tst_blackboxqt.cpp +++ b/tests/auto/blackbox/tst_blackboxqt.cpp @@ -42,23 +42,7 @@ using qbs::Profile; TestBlackboxQt::TestBlackboxQt() : TestBlackboxBase (SRCDIR "/testdata-qt", "blackbox-qt") { -} - -void TestBlackboxQt::validateTestProfile() -{ - const SettingsPtr s = settings(); - if (profileName() != "none" && !s->profiles().contains(profileName())) - QFAIL(QByteArray("The build profile '" + profileName().toLocal8Bit() + - "' could not be found. Please set it up on your machine.")); - const QStringList qmakeFilePaths = Profile(profileName(), s.get()) - .value("moduleProviders.Qt.qmakeFilePaths").toStringList(); - if (!qmakeFilePaths.empty()) - return; - if (!findExecutable(QStringList{"qmake"}).isEmpty()) - return; - QSKIP(QByteArray("The build profile '" + profileName().toLocal8Bit() + - "' is not a valid Qt profile and Qt was not found " - "in the global search paths.")); + setNeedsQt(); } void TestBlackboxQt::addQObjectMacroToGeneratedCppFile() |