From 0b141d7ecb103d53cc3ea93db505400fe29b46e5 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 27 Mar 2018 10:19:56 +0200 Subject: Fix qbsTargetPlatformFromQtMkspec for mkspecs in subdirectories 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 Reviewed-by: Joerg Bornemann --- src/lib/qtprofilesetup/qtprofilesetup.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/lib/qtprofilesetup/qtprofilesetup.cpp') 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-"))) -- cgit v1.2.3