From c74a3042d449e9637ddf2f236492693bc6e966bb Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Thu, 20 Feb 2020 14:51:45 +0100
Subject: QmlProject: Add qtForMCU flag

Change-Id: Ia473fd257414f5edddc0ffcce8c913897d75f351
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 .../qmlprojectmanager/fileformat/qmlprojectfileformat.cpp        | 4 ++++
 src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp      | 5 +++++
 src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h        | 4 ++++
 src/plugins/qmlprojectmanager/qmlproject.cpp                     | 9 +++++++++
 src/plugins/qmlprojectmanager/qmlproject.h                       | 1 +
 src/plugins/qmlprojectmanager/qmlprojectconstants.h              | 1 +
 6 files changed, 24 insertions(+)

(limited to 'src/plugins/qmlprojectmanager')

diff --git a/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.cpp b/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.cpp
index f62c7c1294e..1ad4bb0590c 100644
--- a/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.cpp
+++ b/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.cpp
@@ -101,6 +101,10 @@ QmlProjectItem *QmlProjectFileFormat::parseProjectFile(const Utils::FilePath &fi
         if (targetDirectoryPropery.isValid())
             projectItem->setTargetDirectory(targetDirectoryPropery.toString());
 
+        const QVariant qtForMCUProperty = rootNode->property("qtForMCUs");
+        if (qtForMCUProperty.isValid() && qtForMCUProperty.toBool())
+            projectItem->setQtForMCUs(targetDirectoryPropery.toBool());
+
         if (debug)
             qDebug() << "importPath:" << importPathsProperty << "mainFile:" << mainFileProperty;
 
diff --git a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp
index b36938b9f22..34f0591b178 100644
--- a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp
+++ b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp
@@ -55,6 +55,11 @@ void QmlProjectItem::setTargetDirectory(const QString &directoryPath)
     m_targetDirectory = directoryPath;
 }
 
+void QmlProjectItem::setQtForMCUs(bool b)
+{
+    m_qtForMCUs = b;
+}
+
 void QmlProjectItem::setImportPaths(const QStringList &importPaths)
 {
     if (m_importPaths != importPaths)
diff --git a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h
index 5245e3872cf..68dfe6d55d3 100644
--- a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h
+++ b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h
@@ -51,6 +51,9 @@ public:
     QString targetDirectory() const { return m_targetDirectory; }
     void setTargetDirectory(const QString &directoryPath);
 
+    bool qtForMCUs() const { return m_qtForMCUs; }
+    void setQtForMCUs(bool qtForMCUs);
+
     QStringList importPaths() const { return m_importPaths; }
     void setImportPaths(const QStringList &paths);
 
@@ -83,6 +86,7 @@ protected:
     Utils::EnvironmentItems m_environment;
     QVector<QmlProjectContentItem *> m_content; // content property
     bool m_forceFreeType = false;
+    bool m_qtForMCUs = false;
 };
 
 } // namespace QmlProjectManager
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp
index 6d93305e6d7..fc622179cae 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.cpp
+++ b/src/plugins/qmlprojectmanager/qmlproject.cpp
@@ -205,6 +205,13 @@ QString QmlBuildSystem::mainFile() const
     return QString();
 }
 
+bool QmlBuildSystem::qtForMCUs() const
+{
+    if (m_projectItem)
+        return m_projectItem.data()->qtForMCUs();
+    return false;
+}
+
 void QmlBuildSystem::setMainFile(const QString &mainFilePath)
 {
     if (m_projectItem)
@@ -393,6 +400,8 @@ QVariant QmlBuildSystem::additionalData(Id id) const
         return customFileSelectors();
     if (id == Constants::customForceFreeTypeData)
         return forceFreeType();
+    if (id == Constants::customQtForMCUs)
+        return qtForMCUs();
     return {};
 }
 
diff --git a/src/plugins/qmlprojectmanager/qmlproject.h b/src/plugins/qmlprojectmanager/qmlproject.h
index b1b4c6bd536..0cff1528984 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.h
+++ b/src/plugins/qmlprojectmanager/qmlproject.h
@@ -76,6 +76,7 @@ public:
 
     Utils::FilePath canonicalProjectDir() const;
     QString mainFile() const;
+    bool qtForMCUs() const;
     void setMainFile(const QString &mainFilePath);
     Utils::FilePath targetDirectory() const;
     Utils::FilePath targetFile(const Utils::FilePath &sourceFile) const;
diff --git a/src/plugins/qmlprojectmanager/qmlprojectconstants.h b/src/plugins/qmlprojectmanager/qmlprojectconstants.h
index ecf39bc32ca..10d3bafc692 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectconstants.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectconstants.h
@@ -33,6 +33,7 @@ namespace Constants {
 const char * const QMLPROJECT_MIMETYPE = QmlJSTools::Constants::QMLPROJECT_MIMETYPE;
 const char customFileSelectorsData[] = "CustomFileSelectorsData";
 const char customForceFreeTypeData[] = "CustomForceFreeType";
+const char customQtForMCUs[] = "CustomQtForMCUs";
 
 } // namespace Constants
 } // namespace QmlProjectManager
-- 
cgit v1.2.3