diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2016-09-05 13:35:56 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2016-09-05 13:35:56 +0200 |
| commit | 4bc574125b76f480c8eb5719459baa9bd0b8e1c3 (patch) | |
| tree | 5248d80420cbea7aa39f5355cf5b320486b99a1c /src/app/qbs-setup-qt | |
| parent | 9362b2a4be9f3a92020a169f1bb2896667974dda (diff) | |
| parent | 3a51a17d72f49647449eab949ae30d7c09ced3ef (diff) | |
Merge 1.6 into master
Change-Id: Ica9e01e8dc03fe0d36568a270bbad9b85919c952
Diffstat (limited to 'src/app/qbs-setup-qt')
| -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 717b2c671..b7334afa7 100644 --- a/src/app/qbs-setup-qt/setupqt.cpp +++ b/src/app/qbs-setup-qt/setupqt.cpp @@ -295,9 +295,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; |