From 200e7dd437b0a7cc9d87c3537881b02f785164aa Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Wed, 14 Dec 2016 11:32:24 +0100 Subject: [PATCH] QmakeKitInformation: Leave boot2Qt kits alone HACK! The magic in QmakeKitInformation::setup() should be removed altogether, but that is something I dare not do in a patch release. HACK! Change-Id: If3f0ec9976171977c253cee531203ac3ab41c6a7 Reviewed-by: Eike Ziller --- src/plugins/qmakeprojectmanager/qmakekitinformation.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp b/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp index 9934bfb9286..70e68e77041 100644 --- a/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp +++ b/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp @@ -72,10 +72,14 @@ void QmakeKitInformation::setup(Kit *k) if (!version) return; + if (version->type() == "Boot2Qt.QtVersionType") // HACK: Ignore boot2Qt kits! + return; + FileName spec = QmakeKitInformation::mkspec(k); if (spec.isEmpty()) spec = version->mkspec(); + ToolChain *tc = ToolChainKitInformation::toolChain(k, ToolChain::Language::Cxx); if (!tc || (!tc->suggestedMkspecList().empty() && !tc->suggestedMkspecList().contains(spec))) {