diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2019-12-06 11:27:56 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-12-09 10:31:30 +0000 |
| commit | 56b82c41c47012d4784941402ecfd413d22310f5 (patch) | |
| tree | ee7513e286dcc2b226cb73e7d79c7aaa07419a71 /src/tools | |
| parent | 3c41b91d44838fcadfa50c4044e338d43a27cc10 (diff) | |
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 <christian.kandeler@qt.io>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/sdktool/addkitoperation.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/tools/sdktool/addkitoperation.cpp b/src/tools/sdktool/addkitoperation.cpp index 5eef6e7115..f0213f17a3 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(); |