diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2020-02-23 17:59:57 +0100 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-03-09 10:13:15 +0000 |
| commit | 1b3f4b0ac80c0b66eef2c03df4c4385044aa7ba6 (patch) | |
| tree | 1dabf07cc3f30f42f97272818c83ab61b3e2fe51 /tests/auto/blackbox/tst_blackboxqt.cpp | |
| parent | 16e4b2e6d6a3bce11ce7e021c1fb40194e3fb8dd (diff) | |
setup-toolchains now sets the qbs.toolchainType, not qbs.toolchain
Change-Id: I21f0626a093db358f8f5dfa6248672c44edc82e2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests/auto/blackbox/tst_blackboxqt.cpp')
| -rw-r--r-- | tests/auto/blackbox/tst_blackboxqt.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/blackbox/tst_blackboxqt.cpp b/tests/auto/blackbox/tst_blackboxqt.cpp index a77676ea2..dd2a4139d 100644 --- a/tests/auto/blackbox/tst_blackboxqt.cpp +++ b/tests/auto/blackbox/tst_blackboxqt.cpp @@ -245,7 +245,7 @@ void TestBlackboxQt::mixedBuildVariants() QDir::setCurrent(testDataDir + "/mixed-build-variants"); const SettingsPtr s = settings(); Profile profile(profileName(), s.get()); - if (profile.value("qbs.toolchain").toStringList().contains("msvc")) { + if (profileToolchain(profile).contains("msvc")) { QbsRunParameters params; params.arguments << "qbs.buildVariant:debug"; params.expectFailure = true; @@ -362,7 +362,7 @@ void TestBlackboxQt::qmlDebugging() QCOMPARE(runQbs(), 0); const SettingsPtr s = settings(); Profile profile(profileName(), s.get()); - if (!profile.value("qbs.toolchain").toStringList().contains("gcc")) + if (!profileToolchain(profile).contains("gcc")) return; QProcess nm; nm.start("nm", QStringList(relativeExecutableFilePath("debuggable-app"))); |