feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlProject: Fix incorrect conversion of MCU property

Browse Source 
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>
This commit is contained in:
Burak Hancerli
2023-08-24 17:09:29 +02:00
parent 29a207c59f
commit c71ebda677
4 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmlprojectmanager/buildsystem/projectitem/converters.cpp
View File

@@ -137,7 +137,7 @@ QString jsonToQmlProject(const QJsonObject &rootObject)
appendString("qdsVersion", versionConfig["designStudio"].toString()); appendString("qdsVersion", versionConfig["designStudio"].toString());
appendString("quickVersion", versionConfig["qtQuick"].toString()); appendString("quickVersion", versionConfig["qtQuick"].toString());
appendBool("qt6Project", versionConfig["qt"].toString() == "6"); appendBool("qt6Project", versionConfig["qt"].toString() == "6");
appendBool("qtForMCUs", rootObject["mcuConfig"].toObject().isEmpty()); appendBool("qtForMCUs", !(rootObject["mcuConfig"].toObject().isEmpty()));
appendBreak(); appendBreak();
appendBool("multilanguageSupport", languageConfig["multiLanguageSupport"].toBool()); appendBool("multilanguageSupport", languageConfig["multiLanguageSupport"].toBool());
appendString("primaryLanguage", languageConfig["primaryLanguage"].toString()); appendString("primaryLanguage", languageConfig["primaryLanguage"].toString());

2
tests/unit/tests/unittests/qmlprojectmanager/data/converter/test-set-1/testfile.qmlproject
View File

@@ -91,6 +91,8 @@ Project {
quickVersion: "6.2" quickVersion: "6.2"
qtForMCUs: true
/* If any modules the project imports require widgets (e.g. QtCharts), widgetApp must be true */ /* If any modules the project imports require widgets (e.g. QtCharts), widgetApp must be true */
widgetApp: true widgetApp: true

1
tests/unit/tests/unittests/qmlprojectmanager/data/converter/test-set-1/testfile.qmltojson
View File

@@ -147,6 +147,7 @@
] ]
}, },
"mcuConfig": { "mcuConfig": {
"mcuEnabled": true
}, },
"runConfig": { "runConfig": {
"fileSelectors": [ "fileSelectors": [

2
tests/unit/tests/unittests/qmlprojectmanager/data/converter/test-set-2/testfile.jsontoqml
View File

@@ -13,7 +13,7 @@ Project {
qdsVersion: "" qdsVersion: ""
quickVersion: "" quickVersion: ""
qt6Project: false qt6Project: false
qtForMCUs: true qtForMCUs: false
multilanguageSupport: false multilanguageSupport: false
primaryLanguage: "" primaryLanguage: ""