SDKtool: Fix cmake related options to addKit

Change-Id: Ib51656957593b2f159bd4ef31e3be9840938cd81
Reviewed-by: Richard Pannek <richard.pannek@pelagicore.com>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>

1 files changed, 4 insertions, 5 deletions

diff --git a/src/tools/sdktool/addkitoperation.cpp b/src/tools/sdktool/addkitoperation.cpp
index aadeb00d7f..ff8ad11b1a 100644
--- a/src/tools/sdktool/addkitoperation.cpp
+++ b/src/tools/sdktool/addkitoperation.cpp
@@ -665,7 +665,7 @@ QVariantMap AddKitOperation::addKit(const QVariantMap &map, const QVariantMap &t
     if (!mkspec.isNull())
         data << KeyValuePair({ kit, DATA, MKSPEC }, QVariant(mkspec));
     if (!cmakeId.isNull())
-        data << KeyValuePair({kit, CMAKE_ID}, QVariant(cmakeId));
+        data << KeyValuePair({kit, DATA, CMAKE_ID}, QVariant(cmakeId));
     if (!cmakeGenerator.isNull()) {
         QVariantMap generatorMap;
         generatorMap.insert("Generator", cmakeGenerator);
@@ -675,11 +675,10 @@ QVariantMap AddKitOperation::addKit(const QVariantMap &map, const QVariantMap &t
             generatorMap.insert("Toolset", cmakeGeneratorToolset);
         if (!cmakeGeneratorPlatform.isNull())
             generatorMap.insert("Platform", cmakeGeneratorPlatform);
-        data << KeyValuePair({ kit, CMAKE_GENERATOR }, generatorMap);
-    }
-    if (!cmakeConfiguration.isEmpty()) {
-        data << KeyValuePair({kit, CMAKE_CONFIGURATION}, QVariant(cmakeConfiguration));
+        data << KeyValuePair({ kit, DATA, CMAKE_GENERATOR }, generatorMap);
     }
+    if (!cmakeConfiguration.isEmpty())
+        data << KeyValuePair({kit, DATA, CMAKE_CONFIGURATION}, QVariant(cmakeConfiguration));
     if (!env.isEmpty())
         data << KeyValuePair({ kit, DATA, ENV }, QVariant(env));