Move SimpleProjectWizard to ProjectExplorer plugin

Now SimpleProjectWizard supports also cmake buildsystem therefore
qmakeprojectmanager it's not the best place to keeping it.

Change-Id: I383ee89ea22e8df157cd98f644d3fd971e3c2382
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

src/plugins/projectexplorer/CMakeLists.txt

@@ -163,6 +163,7 @@ add_qtc_plugin(ProjectExplorer
     sessionview.cpp sessionview.h
     showineditortaskhandler.cpp showineditortaskhandler.h
     showoutputtaskhandler.cpp showoutputtaskhandler.h
+    simpleprojectwizard.cpp simpleprojectwizard.h
     target.cpp target.h
     targetsettingspanel.cpp targetsettingspanel.h
     targetsetuppage.cpp targetsetuppage.h

src/plugins/projectexplorer/projectexplorer.cpp

@@ -98,6 +98,7 @@
 #include "targetsettingspanel.h"
 #include "projectpanelfactory.h"
 #include "projectexplorericons.h"
+#include "simpleprojectwizard.h"
 
 #include "windebuginterface.h"
 #include "msvctoolchain.h"
@@ -708,6 +709,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
         QList<IWizardFactory *> result;
         result << CustomWizard::createWizards();
         result << JsonWizardFactory::createWizardFactories();
+        result << new SimpleProjectWizard;
         return result;
     });
 

src/plugins/projectexplorer/projectexplorer.pro

@@ -166,7 +166,8 @@ HEADERS += projectexplorer.h \
     parseissuesdialog.h \
     projectconfigurationaspects.h \
     treescanner.h \
-    rawprojectpart.h
+    rawprojectpart.h \
+    simpleprojectwizard.h
 
 SOURCES += projectexplorer.cpp \
     abi.cpp \
@@ -313,7 +314,8 @@ SOURCES += projectexplorer.cpp \
     parseissuesdialog.cpp \
     projectconfigurationaspects.cpp \
     treescanner.cpp \
-    rawprojectpart.cpp
+    rawprojectpart.cpp \
+    simpleprojectwizard.cpp
 
 FORMS += \
     editorsettingspropertiespage.ui \

src/plugins/projectexplorer/projectexplorer.qbs

@@ -143,6 +143,7 @@ Project {
                 "sessiondialog.cpp", "sessiondialog.h", "sessiondialog.ui",
                 "showineditortaskhandler.cpp", "showineditortaskhandler.h",
                 "showoutputtaskhandler.cpp", "showoutputtaskhandler.h",
+                "simpleprojectwizard.cpp", "simpleprojectwizard.h",
                 "target.cpp", "target.h",
                 "targetsettingspanel.cpp", "targetsettingspanel.h",
                 "targetsetuppage.cpp", "targetsetuppage.h",

src/plugins/projectexplorer/projectexplorer.qrc

@@ -86,5 +86,7 @@
         <file>images/settingscategory_kits@2x.png</file>
         <file>images/settingscategory_cpp.png</file>
         <file>images/settingscategory_cpp@2x.png</file>
+        <file>images/importasproject.png</file>
+        <file>images/importasproject@2x.png</file>
     </qresource>
 </RCC>

src/plugins/projectexplorer/simpleprojectwizard.cpp

@@ -25,7 +25,7 @@
 
 #include "simpleprojectwizard.h"
 
-#include <qmakeprojectmanager/qmakeprojectmanagerconstants.h>
+#include "projectexplorerconstants.h"
 
 #include <app/app_version.h>
 
@@ -36,6 +36,7 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/customwizard/customwizard.h>
 #include <projectexplorer/selectablefilesmodel.h>
+#include <qmakeprojectmanager/qmakeprojectmanagerconstants.h>
 
 #include <utils/algorithm.h>
 #include <utils/fileutils.h>
@@ -56,10 +57,9 @@
 #include <QWizardPage>
 
 using namespace Core;
-using namespace ProjectExplorer;
 using namespace Utils;
 
-namespace QmakeProjectManager {
+namespace ProjectExplorer {
 namespace Internal {
 
 class SimpleProjectWizardDialog;
@@ -169,7 +169,7 @@ SimpleProjectWizard::SimpleProjectWizard()
 {
     setSupportedProjectTypes({QmakeProjectManager::Constants::QMAKEPROJECT_ID,
                               CMakeProjectManager::Constants::CMAKEPROJECT_ID});
-    setIcon(QIcon(QLatin1String(":/qmakeprojectmanager/images/qmakeprojectmanager.png")));
+    setIcon(QIcon(QLatin1String(":/projectexplorer/images/importasproject.png")));
     setDisplayName(tr("Import as qmake or cmake Project (Limited Functionality)"));
     setId("Z.DummyProFile");
     setDescription(tr("Imports existing projects that do not use qmake, CMake or Autotools.<p>"
@@ -356,6 +356,6 @@ bool SimpleProjectWizard::postGenerateFiles(const QWizard *w, const GeneratedFil
 }
 
 } // namespace Internal
-} // namespace QmakeProjectManager
+} // namespace GenericProjectManager
 
 #include "simpleprojectwizard.moc"

src/plugins/projectexplorer/simpleprojectwizard.h

@@ -27,7 +27,7 @@
 
 #include <coreplugin/basefilewizardfactory.h>
 
-namespace QmakeProjectManager {
+namespace ProjectExplorer {
 namespace Internal {
 
 class SimpleProjectWizard : public Core::BaseFileWizardFactory
@@ -45,4 +45,4 @@ private:
 };
 
 } // namespace Internal
-} // namespace QmakeProjectManager
+} // namespace ProjectExplorer

src/plugins/qmakeprojectmanager/CMakeLists.txt

@@ -41,7 +41,6 @@ add_qtc_plugin(QmakeProjectManager
     qmakestep.cpp qmakestep.h
     wizards/qtprojectparameters.cpp wizards/qtprojectparameters.h
     wizards/qtwizard.cpp wizards/qtwizard.h
-    wizards/simpleprojectwizard.cpp wizards/simpleprojectwizard.h
     wizards/subdirsprojectwizard.cpp wizards/subdirsprojectwizard.h
     wizards/subdirsprojectwizarddialog.cpp wizards/subdirsprojectwizarddialog.h
     wizards/wizards.qrc

src/plugins/qmakeprojectmanager/qmakeprojectmanager.pro

@@ -22,7 +22,6 @@ HEADERS += \
     wizards/qtwizard.h \
     wizards/subdirsprojectwizard.h \
     wizards/subdirsprojectwizarddialog.h \
-    wizards/simpleprojectwizard.h \
     qmakeprojectmanagerconstants.h \
     qmakestep.h \
     externaleditors.h \
@@ -52,7 +51,6 @@ SOURCES += \
     wizards/qtwizard.cpp \
     wizards/subdirsprojectwizard.cpp \
     wizards/subdirsprojectwizarddialog.cpp \
-    wizards/simpleprojectwizard.cpp \
     qmakestep.cpp \
     externaleditors.cpp \
     qmakebuildconfiguration.cpp \

src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs

@@ -78,7 +78,6 @@ Project {
                 "qtwizard.cpp", "qtwizard.h",
                 "subdirsprojectwizard.cpp", "subdirsprojectwizard.h",
                 "subdirsprojectwizarddialog.cpp", "subdirsprojectwizarddialog.h",
-                "simpleprojectwizard.cpp", "simpleprojectwizard.h",
                 "wizards.qrc"
             ]
         }

src/plugins/qmakeprojectmanager/qmakeprojectmanager.qrc

@@ -3,7 +3,5 @@
         <file>images/dark_headers.png</file>
         <file>images/dark_sources.png</file>
         <file>images/dark_unknown.png</file>
-        <file>images/qmakeprojectmanager.png</file>
-        <file>images/qmakeprojectmanager@2x.png</file>
     </qresource>
 </RCC>

src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp

@@ -32,7 +32,6 @@
 #include "qmakestep.h"
 #include "qmakemakestep.h"
 #include "qmakebuildconfiguration.h"
-#include "wizards/simpleprojectwizard.h"
 #include "wizards/subdirsprojectwizard.h"
 #include "customwidgetwizard/customwidgetwizard.h"
 #include "qmakeprojectmanagerconstants.h"
@@ -145,8 +144,7 @@ bool QmakeProjectManagerPlugin::initialize(const QStringList &arguments, QString
     IWizardFactory::registerFactoryCreator([] {
         return QList<IWizardFactory *> {
             new SubdirsProjectWizard,
-            new CustomWidgetWizard,
+            new CustomWidgetWizard
-            new SimpleProjectWizard
         };
     });