From c71ebda677925068997fbb6d5ab46583040a95db Mon Sep 17 00:00:00 2001
From: Burak Hancerli <burak.hancerli@qt.io>
Date: Thu, 24 Aug 2023 17:09:29 +0200
Subject: [PATCH] QmlProject: Fix incorrect conversion of MCU property

Task-number: QDS-10376
Change-Id: Ic16d03355419281a0bf5c8bd04ba5fea317a70d4
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
---
 .../qmlprojectmanager/buildsystem/projectitem/converters.cpp    | 2 +-
 .../data/converter/test-set-1/testfile.qmlproject               | 2 ++
 .../data/converter/test-set-1/testfile.qmltojson                | 1 +
 .../data/converter/test-set-2/testfile.jsontoqml                | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/plugins/qmlprojectmanager/buildsystem/projectitem/converters.cpp b/src/plugins/qmlprojectmanager/buildsystem/projectitem/converters.cpp
index 7f01e33f435..8487c00cd7e 100644
--- a/src/plugins/qmlprojectmanager/buildsystem/projectitem/converters.cpp
+++ b/src/plugins/qmlprojectmanager/buildsystem/projectitem/converters.cpp
@@ -137,7 +137,7 @@ QString jsonToQmlProject(const QJsonObject &rootObject)
             appendString("qdsVersion", versionConfig["designStudio"].toString());
             appendString("quickVersion", versionConfig["qtQuick"].toString());
             appendBool("qt6Project", versionConfig["qt"].toString() == "6");
-            appendBool("qtForMCUs", rootObject["mcuConfig"].toObject().isEmpty());
+            appendBool("qtForMCUs", !(rootObject["mcuConfig"].toObject().isEmpty()));
             appendBreak();
             appendBool("multilanguageSupport", languageConfig["multiLanguageSupport"].toBool());
             appendString("primaryLanguage", languageConfig["primaryLanguage"].toString());
diff --git a/tests/unit/tests/unittests/qmlprojectmanager/data/converter/test-set-1/testfile.qmlproject b/tests/unit/tests/unittests/qmlprojectmanager/data/converter/test-set-1/testfile.qmlproject
index 1ff457cdd87..d3e15d20be2 100644
--- a/tests/unit/tests/unittests/qmlprojectmanager/data/converter/test-set-1/testfile.qmlproject
+++ b/tests/unit/tests/unittests/qmlprojectmanager/data/converter/test-set-1/testfile.qmlproject
@@ -91,6 +91,8 @@ Project {
 
     quickVersion: "6.2"
 
+    qtForMCUs: true
+
     /* If any modules the project imports require widgets (e.g. QtCharts), widgetApp must be true */
     widgetApp: true
 
diff --git a/tests/unit/tests/unittests/qmlprojectmanager/data/converter/test-set-1/testfile.qmltojson b/tests/unit/tests/unittests/qmlprojectmanager/data/converter/test-set-1/testfile.qmltojson
index 9abc7a76c3c..293b8e96524 100644
--- a/tests/unit/tests/unittests/qmlprojectmanager/data/converter/test-set-1/testfile.qmltojson
+++ b/tests/unit/tests/unittests/qmlprojectmanager/data/converter/test-set-1/testfile.qmltojson
@@ -147,6 +147,7 @@
         ]
     },
     "mcuConfig": {
+        "mcuEnabled": true
     },
     "runConfig": {
         "fileSelectors": [
diff --git a/tests/unit/tests/unittests/qmlprojectmanager/data/converter/test-set-2/testfile.jsontoqml b/tests/unit/tests/unittests/qmlprojectmanager/data/converter/test-set-2/testfile.jsontoqml
index a05b24e9e61..e1ec5b97566 100644
--- a/tests/unit/tests/unittests/qmlprojectmanager/data/converter/test-set-2/testfile.jsontoqml
+++ b/tests/unit/tests/unittests/qmlprojectmanager/data/converter/test-set-2/testfile.jsontoqml
@@ -13,7 +13,7 @@ Project {
     qdsVersion: ""
     quickVersion: ""
     qt6Project: false
-    qtForMCUs: true
+    qtForMCUs: false
 
     multilanguageSupport: false
     primaryLanguage: ""