diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-03-27 10:19:56 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-03-27 11:40:50 +0000 |
commit | 0b141d7ecb103d53cc3ea93db505400fe29b46e5 (patch) | |
tree | d0baea74f24a9fd2e9425f711d9ea0c5e332b91e | |
parent | caa7d868fca080029dd77b44fafc830acf17a158 (diff) |
Fix qbsTargetPlatformFromQtMkspec for mkspecs in subdirectoriesv1.11.0
The function qbsTargetPlatformFromQtMkspec failed for mkspecs like
"devices/linux-oe-generic-g++". Now we only inspect the part after the
last slash.
Task-number: QBS-1328
Task-number: QTCREATORBUG-20136
Change-Id: I41cf686bd8eff4235ce86de30afa8730d3696abc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-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 f9feb3a58..9d77a457f 100644 --- a/src/lib/qtprofilesetup/qtprofilesetup.cpp +++ b/src/lib/qtprofilesetup/qtprofilesetup.cpp @@ -760,6 +760,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-"))) |