From e763ce28e8bb10c66b2032e6c99fe561af230917 Mon Sep 17 00:00:00 2001 From: Kari Oikarinen Date: Thu, 11 May 2017 17:35:05 +0300 Subject: [PATCH] QmakeKitInformation: Leave new Boot2Qt Qt versions also alone Original check was introduced in 200e7dd437b0a7cc9d87c3537881b02f785164aa, but in Boot2Qt 5.9 Qt versions use a different id. This lead to Emulator kits using system g++ on Linux instead of the provided one. Possibly also other way (desktop using emulator g++). Task-number: QTCREATORBUG-18169 Change-Id: I42f0da784ccaf749ce2eaba5d689bbdb8c11f971 Reviewed-by: Eike Ziller Reviewed-by: Tobias Hunger --- src/plugins/qmakeprojectmanager/qmakekitinformation.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp b/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp index 4b85e30b0e5..3420fca5109 100644 --- a/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp +++ b/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp @@ -74,7 +74,8 @@ void QmakeKitInformation::setup(Kit *k) if (!version) return; - if (version->type() == "Boot2Qt.QtVersionType") // HACK: Ignore boot2Qt kits! + // HACK: Ignore Boot2Qt kits! + if (version->type() == "Boot2Qt.QtVersionType" || version->type() == "Qdb.EmbeddedLinuxQt") return; FileName spec = QmakeKitInformation::mkspec(k);