From 42b595d86556e532dbbb07c337c4884745aafda6 Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Thu, 27 Feb 2020 09:22:36 +0200 Subject: [PATCH] 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 --- src/plugins/projectexplorer/CMakeLists.txt | 1 + .../images/importasproject.png} | Bin .../images/importasproject@2x.png} | Bin src/plugins/projectexplorer/projectexplorer.cpp | 2 ++ src/plugins/projectexplorer/projectexplorer.pro | 6 ++++-- src/plugins/projectexplorer/projectexplorer.qbs | 1 + src/plugins/projectexplorer/projectexplorer.qrc | 2 ++ .../simpleprojectwizard.cpp | 10 +++++----- .../simpleprojectwizard.h | 4 ++-- src/plugins/qmakeprojectmanager/CMakeLists.txt | 1 - .../qmakeprojectmanager/qmakeprojectmanager.pro | 2 -- .../qmakeprojectmanager/qmakeprojectmanager.qbs | 1 - .../qmakeprojectmanager/qmakeprojectmanager.qrc | 2 -- .../qmakeprojectmanagerplugin.cpp | 4 +--- 14 files changed, 18 insertions(+), 18 deletions(-) rename src/plugins/{qmakeprojectmanager/images/qmakeprojectmanager.png => projectexplorer/images/importasproject.png} (100%) rename src/plugins/{qmakeprojectmanager/images/qmakeprojectmanager@2x.png => projectexplorer/images/importasproject@2x.png} (100%) rename src/plugins/{qmakeprojectmanager/wizards => projectexplorer}/simpleprojectwizard.cpp (98%) rename src/plugins/{qmakeprojectmanager/wizards => projectexplorer}/simpleprojectwizard.h (96%) diff --git a/src/plugins/projectexplorer/CMakeLists.txt b/src/plugins/projectexplorer/CMakeLists.txt index 60176adceed..a7aa76ae502 100644 --- a/src/plugins/projectexplorer/CMakeLists.txt +++ b/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 diff --git a/src/plugins/qmakeprojectmanager/images/qmakeprojectmanager.png b/src/plugins/projectexplorer/images/importasproject.png similarity index 100% rename from src/plugins/qmakeprojectmanager/images/qmakeprojectmanager.png rename to src/plugins/projectexplorer/images/importasproject.png diff --git a/src/plugins/qmakeprojectmanager/images/qmakeprojectmanager@2x.png b/src/plugins/projectexplorer/images/importasproject@2x.png similarity index 100% rename from src/plugins/qmakeprojectmanager/images/qmakeprojectmanager@2x.png rename to src/plugins/projectexplorer/images/importasproject@2x.png diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 862ea2864a5..71a0ec5468c 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/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 result; result << CustomWizard::createWizards(); result << JsonWizardFactory::createWizardFactories(); + result << new SimpleProjectWizard; return result; }); diff --git a/src/plugins/projectexplorer/projectexplorer.pro b/src/plugins/projectexplorer/projectexplorer.pro index aa3fc2eb546..e9357a8e651 100644 --- a/src/plugins/projectexplorer/projectexplorer.pro +++ b/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 \ diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs index 4b8bb4b8941..a3d53a22627 100644 --- a/src/plugins/projectexplorer/projectexplorer.qbs +++ b/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", diff --git a/src/plugins/projectexplorer/projectexplorer.qrc b/src/plugins/projectexplorer/projectexplorer.qrc index 36b149e2538..0f5e0dc3069 100644 --- a/src/plugins/projectexplorer/projectexplorer.qrc +++ b/src/plugins/projectexplorer/projectexplorer.qrc @@ -86,5 +86,7 @@ images/settingscategory_kits@2x.png images/settingscategory_cpp.png images/settingscategory_cpp@2x.png + images/importasproject.png + images/importasproject@2x.png diff --git a/src/plugins/qmakeprojectmanager/wizards/simpleprojectwizard.cpp b/src/plugins/projectexplorer/simpleprojectwizard.cpp similarity index 98% rename from src/plugins/qmakeprojectmanager/wizards/simpleprojectwizard.cpp rename to src/plugins/projectexplorer/simpleprojectwizard.cpp index a169e3d4484..d9d88aa3158 100644 --- a/src/plugins/qmakeprojectmanager/wizards/simpleprojectwizard.cpp +++ b/src/plugins/projectexplorer/simpleprojectwizard.cpp @@ -25,7 +25,7 @@ #include "simpleprojectwizard.h" -#include +#include "projectexplorerconstants.h" #include @@ -36,6 +36,7 @@ #include #include #include +#include #include #include @@ -56,10 +57,9 @@ #include 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.

" @@ -356,6 +356,6 @@ bool SimpleProjectWizard::postGenerateFiles(const QWizard *w, const GeneratedFil } } // namespace Internal -} // namespace QmakeProjectManager +} // namespace GenericProjectManager #include "simpleprojectwizard.moc" diff --git a/src/plugins/qmakeprojectmanager/wizards/simpleprojectwizard.h b/src/plugins/projectexplorer/simpleprojectwizard.h similarity index 96% rename from src/plugins/qmakeprojectmanager/wizards/simpleprojectwizard.h rename to src/plugins/projectexplorer/simpleprojectwizard.h index ee1f794c3e0..d4bcce5616f 100644 --- a/src/plugins/qmakeprojectmanager/wizards/simpleprojectwizard.h +++ b/src/plugins/projectexplorer/simpleprojectwizard.h @@ -27,7 +27,7 @@ #include -namespace QmakeProjectManager { +namespace ProjectExplorer { namespace Internal { class SimpleProjectWizard : public Core::BaseFileWizardFactory @@ -45,4 +45,4 @@ private: }; } // namespace Internal -} // namespace QmakeProjectManager +} // namespace ProjectExplorer diff --git a/src/plugins/qmakeprojectmanager/CMakeLists.txt b/src/plugins/qmakeprojectmanager/CMakeLists.txt index 835913cac3a..90d48c0347e 100644 --- a/src/plugins/qmakeprojectmanager/CMakeLists.txt +++ b/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 diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.pro b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.pro index ee5e931c9ad..aa56251ada3 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.pro +++ b/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 \ diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs index 7b23de4e178..24a4fce4315 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs +++ b/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" ] } diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qrc b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qrc index 87248770da4..8e13ebeeb5d 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qrc +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qrc @@ -3,7 +3,5 @@ images/dark_headers.png images/dark_sources.png images/dark_unknown.png - images/qmakeprojectmanager.png - images/qmakeprojectmanager@2x.png diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp index 21978b33c24..6ca690f6f06 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp +++ b/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 { new SubdirsProjectWizard, - new CustomWidgetWizard, - new SimpleProjectWizard + new CustomWidgetWizard }; });