From 56b82c41c47012d4784941402ecfd413d22310f5 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 6 Dec 2019 11:27:56 +0100 Subject: [PATCH] SDKTool: Allow for explicitly unsetting Qt in addKitOperation Treat a empty string passed in as argument to --qt as "No Qt" by forcing that to "-1". Fixes: QTCREATORBUG-23168 Change-Id: I03c536d0cc0f7bc2ad291a2bbcc5297df509b524 Reviewed-by: Christian Kandeler --- src/tools/sdktool/addkitoperation.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/tools/sdktool/addkitoperation.cpp b/src/tools/sdktool/addkitoperation.cpp index 5eef6e7115a..f0213f17a3c 100644 --- a/src/tools/sdktool/addkitoperation.cpp +++ b/src/tools/sdktool/addkitoperation.cpp @@ -602,6 +602,11 @@ QVariantMap AddKitOperation::addKit(const QVariantMap &map, const QVariantMap &t std::cerr << "Error: Device " << qPrintable(device) << " does not exist." << std::endl; return QVariantMap(); } + + // Treat a qt that was explicitly set to '' as "no Qt" + if (!qtId.isNull() && qtId.isEmpty()) + qtId = "-1"; + if (!cmakeId.isEmpty() && !AddCMakeOperation::exists(cmakeMap, cmakeId)) { std::cerr << "Error: CMake tool " << qPrintable(cmakeId) << " does not exist." << std::endl; return QVariantMap();