diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2016-09-01 11:05:01 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2016-09-01 14:23:53 +0000 |
| commit | 4057bd7874c166287143355571ccae2d57df5431 (patch) | |
| tree | 608a0d6691666c1c6766e0474344738043d89391 | |
| parent | 696292719b75bd33d2cad0f6dbb9d2c1c123df5c (diff) | |
setup-qt: Fix toolchain profile look-up
Since commit 87a1478921, we no longer set qbs.architecture in the
toolchain profile, but setup-qt still expected it.
Change-Id: Id52c087cd91fa08768bf62a4f9d4850d676fe41a
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| -rw-r--r-- | src/app/qbs-setup-qt/setupqt.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/app/qbs-setup-qt/setupqt.cpp b/src/app/qbs-setup-qt/setupqt.cpp index 2480fcdcb..5ed733005 100644 --- a/src/app/qbs-setup-qt/setupqt.cpp +++ b/src/app/qbs-setup-qt/setupqt.cpp @@ -286,9 +286,7 @@ QtEnvironment SetupQt::fetchEnvironment(const QString &qmakePath) static bool isToolchainProfile(const Profile &profile) { const QSet<QString> actual = profile.allKeys(Profile::KeySelectionRecursive).toSet(); - QSet<QString> expected = QSet<QString>() - << QLatin1String("qbs.toolchain") - << QLatin1String("qbs.architecture"); + QSet<QString> expected = QSet<QString>() << QLatin1String("qbs.toolchain"); if (HostOsInfo::isMacosHost()) expected.insert(QLatin1String("qbs.targetOS")); // match only Xcode profiles return QSet<QString>(actual).unite(expected) == actual; |