diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-04-05 14:38:02 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-04-05 14:38:02 +0200 |
| commit | 882a8c139cf75cbeac54904072916ce62883e1cb (patch) | |
| tree | ce4f2a509d6e8266b327eb4e4e6f01d217b87100 /src/lib/qtprofilesetup | |
| parent | baa09164ae14c58ec11a925a1f0fa57117e8ff1d (diff) | |
| parent | 8da0e97f40abf19a089197c6aec8333a4e92d729 (diff) | |
Merge 1.11 into master
Change-Id: Ia9e19bf1317c55d84602e4e0f54f7a4f412dd600
Diffstat (limited to 'src/lib/qtprofilesetup')
| -rw-r--r-- | src/lib/qtprofilesetup/qtprofilesetup.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/qtprofilesetup/qtprofilesetup.cpp b/src/lib/qtprofilesetup/qtprofilesetup.cpp index e78b8a252..4ef952985 100644 --- a/src/lib/qtprofilesetup/qtprofilesetup.cpp +++ b/src/lib/qtprofilesetup/qtprofilesetup.cpp @@ -811,6 +811,9 @@ void doSetupQtProfile(const QString &profileName, Settings *settings, QString qbsTargetPlatformFromQtMkspec(const QString &mkspec) { + int idx = mkspec.lastIndexOf(QLatin1Char('/')); + if (idx != -1) + return qbsTargetPlatformFromQtMkspec(mkspec.mid(idx + 1)); if (mkspec.startsWith(QLatin1String("aix-"))) return QLatin1String("aix"); if (mkspec.startsWith(QLatin1String("android-"))) |