feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmakeKitInformation: Leave new Boot2Qt Qt versions also alone

Browse Source 
Original check was introduced in
200e7dd437, 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>
This commit is contained in:
Kari Oikarinen
2017-05-11 17:35:05 +03:00
committed by Eike Ziller
parent 83b8c8fc15
commit e763ce28e8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmakeprojectmanager/qmakekitinformation.cpp
View File

@@ -74,7 +74,8 @@ void QmakeKitInformation::setup(Kit *k)
if (!version) if (!version)
return; return;
if (version->type() == "Boot2Qt.QtVersionType") // HACK: Ignore boot2Qt kits! // HACK: Ignore Boot2Qt kits!
if (version->type() == "Boot2Qt.QtVersionType" || version->type() == "Qdb.EmbeddedLinuxQt")
return; return;
FileName spec = QmakeKitInformation::mkspec(k); FileName spec = QmakeKitInformation::mkspec(k);