QmlDesigner: Move CMake generator to QmlProjectManager

Task-number: QDS-6898
Change-Id: Ib1ca2ff4cd17a1ee6c203878a963bf44bac6969b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>

src/plugins/qmldesigner/CMakeLists.txt

@@ -26,15 +26,8 @@ add_qtc_plugin(QmlDesigner
     designmodewidget.cpp designmodewidget.h
     documentmanager.cpp documentmanager.h
     documentwarningwidget.cpp documentwarningwidget.h
-    checkablefiletreeitem.cpp checkablefiletreeitem.h
-    cmakegeneratordialog.cpp cmakegeneratordialog.h
-    cmakegeneratordialogtreemodel.cpp cmakegeneratordialogtreemodel.h
-    cmakeprojectconverter.cpp cmakeprojectconverter.h
-    cmakeprojectconverterdialog.cpp cmakeprojectconverterdialog.h
     dynamiclicensecheck.h
     generateresource.cpp generateresource.h
-    generatecmakelists.cpp generatecmakelists.h
-    generatecmakelistsconstants.h
     openuiqmlfiledialog.cpp openuiqmlfiledialog.h openuiqmlfiledialog.ui
     qmldesignerconstants.h
     qmldesignericons.h
@@ -45,7 +38,6 @@ add_qtc_plugin(QmlDesigner
     designermcumanager.cpp designermcumanager.h
     richtexteditordialog.cpp richtexteditordialog.h
     editorproxy.cpp editorproxy.h
-    boilerplate.qrc
   EXPLICIT_MOC
     components/propertyeditor/propertyeditorvalue.h
     components/connectioneditor/connectionviewwidget.h

src/plugins/qmldesigner/qmldesignerplugin.cpp

@@ -24,11 +24,9 @@
 ****************************************************************************/
 
 #include "qmldesignerplugin.h"
-#include "cmakeprojectconverter.h"
 #include "designmodecontext.h"
 #include "designmodewidget.h"
 #include "exception.h"
-#include "generatecmakelists.h"
 #include "generateresource.h"
 #include "nodeinstanceview.h"
 #include "openuiqmlfiledialog.h"
@@ -241,9 +239,6 @@ bool QmlDesignerPlugin::initialize(const QStringList & /*arguments*/, QString *e
     if (QmlProjectManager::QmlProject::isQtDesignStudio())
         GenerateResource::generateMenuEntry();
 
-    GenerateCmake::generateMenuEntry();
-    GenerateCmake::CmakeProjectConverter::generateMenuEntry();
-
     const QString fontPath
         = Core::ICore::resourcePath(
                 "qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf")

src/plugins/qmldesigner/qmldesignerplugin.qbs

@@ -1030,19 +1030,6 @@ Project {
         files: [
             "generateresource.cpp",
             "generateresource.h",
-            "generatecmakelists.cpp",
-            "generatecmakelists.h",
-            "generatecmakelistsconstants.h",
-            "checkablefiletreeitem.cpp",
-            "checkablefiletreeitem.h",
-            "cmakegeneratordialogtreemodel.cpp",
-            "cmakegeneratordialogtreemodel.h",
-            "cmakegeneratordialog.cpp",
-            "cmakegeneratordialog.h",
-            "cmakeprojectconverter.cpp",
-            "cmakeprojectconverter.h",
-            "cmakeprojectconverterdialog.cpp",
-            "cmakeprojectconverterdialog.h",
             "designersettings.cpp",
             "designersettings.h",
             "designmodecontext.cpp",

src/plugins/qmlprojectmanager/CMakeLists.txt

@@ -7,6 +7,14 @@ add_qtc_plugin(QmlProjectManager
     fileformat/filefilteritems.cpp fileformat/filefilteritems.h
     fileformat/qmlprojectfileformat.cpp fileformat/qmlprojectfileformat.h
     fileformat/qmlprojectitem.cpp fileformat/qmlprojectitem.h
+    cmakegen/checkablefiletreeitem.cpp cmakegen/checkablefiletreeitem.h
+    cmakegen/cmakegeneratordialog.cpp cmakegen/cmakegeneratordialog.h
+    cmakegen/cmakegeneratordialogtreemodel.cpp cmakegen/cmakegeneratordialogtreemodel.h
+    cmakegen/cmakeprojectconverter.cpp cmakegen/cmakeprojectconverter.h
+    cmakegen/cmakeprojectconverterdialog.cpp cmakegen/cmakeprojectconverterdialog.h
+    cmakegen/generatecmakelists.cpp cmakegen/generatecmakelists.h
+    cmakegen/generatecmakelistsconstants.h
+    cmakegen/boilerplate.qrc
     projectfilecontenttools.cpp projectfilecontenttools.h
     qdslandingpage.cpp qdslandingpage.h
     qmlmainfileaspect.cpp qmlmainfileaspect.h

src/plugins/qmlprojectmanager/cmakegen/checkablefiletreeitem.cpp

@@ -27,7 +27,7 @@
 
 using namespace Utils;
 
-namespace QmlDesigner {
+namespace QmlProjectManager {
 
 CheckableFileTreeItem::CheckableFileTreeItem(const FilePath &filePath)
     :QStandardItem(filePath.toString())
@@ -64,4 +64,4 @@ bool CheckableFileTreeItem::isChecked() const
     return this->checked;
 }
 
-} //QmlDesigner
+} //QmlProjectManager

src/plugins/qmlprojectmanager/cmakegen/checkablefiletreeitem.h

@@ -30,7 +30,7 @@
 
 #include <QStandardItem>
 
-namespace QmlDesigner {
+namespace QmlProjectManager {
 
 class CheckableFileTreeItem : public QStandardItem
 {
@@ -48,6 +48,6 @@ private:
     bool checked;
 };
 
-} //QmlDesigner
+} //QmlProjectManager
 
 #endif // CHECKABLEFILETREEITEM_H

src/plugins/qmlprojectmanager/cmakegen/cmakegeneratordialog.cpp

@@ -39,7 +39,7 @@
 
 using namespace Utils;
 
-namespace QmlDesigner {
+namespace QmlProjectManager {
 namespace GenerateCmake {
 
 CmakeGeneratorDialog::CmakeGeneratorDialog(const FilePath &rootDir, const FilePaths &files)
@@ -186,4 +186,4 @@ void CmakeGeneratorDialog::advancedVisibilityChanged(bool visible)
 }
 
 } //GenerateCmake
-} //QmlDesigner
+} //QmlProjectManager

src/plugins/qmlprojectmanager/cmakegen/cmakegeneratordialog.h

@@ -36,7 +36,7 @@
 #include <QTreeView>
 #include <QLabel>
 
-namespace QmlDesigner {
+namespace QmlProjectManager {
 namespace GenerateCmake {
 
 class CmakeGeneratorDialog : public QDialog
@@ -65,6 +65,6 @@ private:
 };
 
 } //GenerateCmake
-} //QmlDesigner
+} //QmlProjectManager
 
 #endif // CMAKEGENERATORDIALOG_H

src/plugins/qmlprojectmanager/cmakegen/cmakegeneratordialogtreemodel.cpp

@@ -31,7 +31,7 @@
 
 using namespace Utils;
 
-namespace QmlDesigner {
+namespace QmlProjectManager {
 namespace GenerateCmake {
 
 CMakeGeneratorDialogTreeModel::CMakeGeneratorDialogTreeModel(const FilePath &rootDir,
@@ -127,16 +127,16 @@ bool CMakeGeneratorDialogTreeModel::checkedByDefault(const Utils::FilePath &file
 {
     if (file.exists()) {
         QString relativePath = file.relativeChildPath(rootDir).toString();
-        if (relativePath.compare(QmlDesigner::GenerateCmake::Constants::FILENAME_CMAKELISTS) == 0)
+        if (relativePath.compare(QmlProjectManager::GenerateCmake::Constants::FILENAME_CMAKELISTS) == 0)
             return false;
-        if (relativePath.endsWith(QmlDesigner::GenerateCmake::Constants::FILENAME_CMAKELISTS)
+        if (relativePath.endsWith(QmlProjectManager::GenerateCmake::Constants::FILENAME_CMAKELISTS)
-            && relativePath.length() > QString(QmlDesigner::GenerateCmake::Constants::FILENAME_CMAKELISTS).length())
+            && relativePath.length() > QString(QmlProjectManager::GenerateCmake::Constants::FILENAME_CMAKELISTS).length())
             return true;
-        if (relativePath.compare(QmlDesigner::GenerateCmake::Constants::FILENAME_MODULES) == 0)
+        if (relativePath.compare(QmlProjectManager::GenerateCmake::Constants::FILENAME_MODULES) == 0)
             return true;
         if (relativePath.compare(
-                FilePath::fromString(QmlDesigner::GenerateCmake::Constants::DIRNAME_CPP)
+                FilePath::fromString(QmlProjectManager::GenerateCmake::Constants::DIRNAME_CPP)
-                .pathAppended(QmlDesigner::GenerateCmake::Constants::FILENAME_MAINCPP_HEADER)
+                .pathAppended(QmlProjectManager::GenerateCmake::Constants::FILENAME_MAINCPP_HEADER)
                 .toString())
                 == 0)
             return true;
@@ -198,4 +198,4 @@ CheckableFileTreeItem* CMakeGeneratorDialogTreeModel::nodeForIndex(const QModelI
 }
 
 } //GenerateCmake
-} //QmlDesigner
+} //QmlProjectManager

src/plugins/qmlprojectmanager/cmakegen/cmakegeneratordialogtreemodel.h

@@ -33,7 +33,7 @@
 
 #include <utils/fileutils.h>
 
-namespace QmlDesigner {
+namespace QmlProjectManager {
 namespace GenerateCmake {
 
 class CMakeGeneratorDialogTreeModel : public QStandardItemModel
@@ -67,7 +67,7 @@ private:
 };
 
 } //GenerateCmake
-} //QmlDesigner
+} //QmlProjectManager
 
 
 #endif // CMAKEGENERATORDIALOGTREEMODEL_H

src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverter.cpp

@@ -40,9 +40,9 @@
 #include <QRegularExpression>
 
 using namespace Utils;
-using namespace QmlDesigner::GenerateCmake::Constants;
+using namespace QmlProjectManager::GenerateCmake::Constants;
 
-namespace QmlDesigner {
+namespace QmlProjectManager {
 namespace GenerateCmake {
 
 const QString MENU_ITEM_CONVERT = QCoreApplication::translate("QmlDesigner::CmakeProjectConverter",
@@ -437,4 +437,4 @@ bool CmakeProjectConverter::modifyProjectFile()
 }
 
 } //GenerateCmake
-} //QmlDesigner
+} //QmlProjectManager

src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverter.h

@@ -29,7 +29,7 @@
 #include <utils/fileutils.h>
 #include <qmlprojectmanager/qmlproject.h>
 
-namespace QmlDesigner {
+namespace QmlProjectManager {
 
 namespace GenerateCmake {
 
@@ -94,6 +94,6 @@ private:
 };
 
 } //GenerateCmake
-} //QmlDesigner
+} //QmlProjectManager
 
 #endif // CMAKEPROJECTCONVERTER_H

src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverterdialog.cpp

@@ -38,7 +38,7 @@
 
 using namespace Utils;
 
-namespace QmlDesigner {
+namespace QmlProjectManager {
 namespace GenerateCmake {
 
 const QRegularExpression projectNameRegexp("^(?!(import))(?!(QtQml))(?!(QtQuick))(?:[A-Z][a-zA-Z0-9-_]*)$");
@@ -224,4 +224,4 @@ bool CmakeProjectConverterDialog::isValid()
 }
 
 } //GenerateCmake
-} //QmlDesigner
+} //QmlProjectManager

src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverterdialog.h

@@ -35,7 +35,7 @@
 
 #include <QDialog>
 
-namespace QmlDesigner {
+namespace QmlProjectManager {
 namespace GenerateCmake {
 
 class CmakeProjectConverterDialog : public QDialog
@@ -64,6 +64,6 @@ private:
 };
 
 } //GenerateCmake
-} //Qmldesigner
+} //QmlProjectManager
 
 #endif // CMAKEPROJECTCONVERTERDIALOG_H

src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp

@@ -51,9 +51,9 @@
 #include <QTextStream>
 
 using namespace Utils;
-using namespace QmlDesigner::GenerateCmake::Constants;
+using namespace QmlProjectManager::GenerateCmake::Constants;
 
-namespace QmlDesigner {
+namespace QmlProjectManager {
 
 namespace GenerateCmake {
 
@@ -622,5 +622,5 @@ bool CmakeFileGenerator::isFileResource(const QString &relativeFilePath)
 }
 
 } //GenerateCmake
-} //QmlDesigner
+} //QmlProjectManager
 

src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.h

@@ -29,7 +29,7 @@
 
 #include <utils/fileutils.h>
 
-namespace QmlDesigner {
+namespace QmlProjectManager {
 namespace GenerateCmake {
 struct GeneratableFile {
     Utils::FilePath filePath;
@@ -95,4 +95,4 @@ private:
 
 } //GenerateCmake
 
-} //QmlDesigner
+} //QmlProjectManager

src/plugins/qmlprojectmanager/cmakegen/generatecmakelistsconstants.h

@@ -28,7 +28,7 @@
 
 #pragma once
 
-namespace QmlDesigner {
+namespace QmlProjectManager {
 namespace GenerateCmake {
 namespace Constants {
 
@@ -59,6 +59,6 @@ const char ENV_VARIABLE_CONTROLCONF[] = "QT_QUICK_CONTROLS_CONF";
 
 } //Constants
 } //GenerateCmake
-} //QmlDesigner
+} //QmlProjectManager
 
 #endif // GENERATECMAKELISTSCONSTANTS_H

src/plugins/qmlprojectmanager/qmlprojectmanager.qbs

@@ -39,4 +39,18 @@ QtcPlugin {
             "qmlprojectitem.cpp", "qmlprojectitem.h",
         ]
     }
+
+    Group {
+        name: "CMake Generator"
+        prefix: "cmakegen/"
+        files: [
+            "generatecmakelists.cpp", "generatecmakelists.h",
+            "generatecmakelistsconstants.h",
+            "checkablefiletreeitem.cpp", "checkablefiletreeitem.h",
+            "cmakegeneratordialogtreemodel.cpp", "cmakegeneratordialogtreemodel.h",
+            "cmakegeneratordialog.cpp", "cmakegeneratordialog.h",
+            "cmakeprojectconverter.cpp", "cmakeprojectconverter.h",
+            "cmakeprojectconverterdialog.cpp", "cmakeprojectconverterdialog.h",
+        ]
+    }
 }

src/plugins/qmlprojectmanager/qmlprojectplugin.cpp

@@ -29,6 +29,8 @@
 #include "qmlprojectconstants.h"
 #include "qmlprojectrunconfiguration.h"
 #include "projectfilecontenttools.h"
+#include "cmakegen/cmakeprojectconverter.h"
+#include "cmakegen/generatecmakelists.h"
 
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
@@ -356,6 +358,9 @@ bool QmlProjectPlugin::initialize(const QStringList &, QString *errorMessage)
                 });
     }
 
+    GenerateCmake::generateMenuEntry();
+    GenerateCmake::CmakeProjectConverter::generateMenuEntry();
+
     return true;
 }