diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2017-05-11 17:35:05 +0300 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-05-16 10:48:51 +0000 |
| commit | e763ce28e8bb10c66b2032e6c99fe561af230917 (patch) | |
| tree | 5c2b071f253d093b9917f285d638400bf634fa45 /src/plugins/qmakeprojectmanager/qmakekitinformation.cpp | |
| parent | 83b8c8fc154502f847f88e2c1ebd203554382d37 (diff) | |
| download | qt-creator-e763ce28e8bb10c66b2032e6c99fe561af230917.tar.gz | |
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 <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/qmakeprojectmanager/qmakekitinformation.cpp')
| -rw-r--r-- | src/plugins/qmakeprojectmanager/qmakekitinformation.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp b/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp index 4b85e30b0e..3420fca510 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); |