diff options
| -rw-r--r-- | .github/workflows/main.yml | 2 | ||||
| -rw-r--r-- | tests/auto/blackbox/tst_blackboxapple.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 45d82c815..807b9faad 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -137,6 +137,8 @@ jobs: toolchain: clang_64 - name: Install Qt Creator uses: ./.github/actions/download-qtc + with: + version: 4.13.2 - name: Setup Qbs run: | qbs setup-toolchains --detect diff --git a/tests/auto/blackbox/tst_blackboxapple.cpp b/tests/auto/blackbox/tst_blackboxapple.cpp index 77ea2f155..d87b1a539 100644 --- a/tests/auto/blackbox/tst_blackboxapple.cpp +++ b/tests/auto/blackbox/tst_blackboxapple.cpp @@ -273,7 +273,7 @@ void TestBlackboxApple::aggregateDependencyLinking() const auto xcodeVersion = findXcodeVersion(); // XCode 11 produces warning about deprecation of 32-bit apps, but still works const bool hasX86Mac = xcodeVersion < qbs::Version(12); - const bool hasArmMac = xcodeVersion >= qbs::Version(12); + const bool hasArmMac = false; QDir::setCurrent(testDataDir + "/aggregateDependencyLinking"); QbsRunParameters params{QStringList{"-p", "multi_arch_lib"}}; @@ -1019,7 +1019,6 @@ QVariantMap TestBlackboxApple::findXcode(int *status) { QTemporaryDir temp; QbsRunParameters params = QStringList({"-f", testDataDir + "/find/find-xcode.qbs"}); - params.profile = "none"; params.buildDirectory = temp.path(); const int res = runQbs(params); if (status) |