Commit 5a79945e authored by Tobias Hunger's avatar Tobias Hunger
Browse files

DebuggingHelper: Move to QtSupport



* Move debugginghelper to QtSupport. ProjectExplorer should not start
  looking for Qt versions!
* Make autotools and generic project plugins depend on QtSupport

Change-Id: If28418a85e3696cba713e66148c893a5a9b6adc7
Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
parent 5c23c44e
...@@ -38,12 +38,12 @@ ...@@ -38,12 +38,12 @@
#include "androidglobal.h" #include "androidglobal.h"
#include "androidpackagecreationstep.h" #include "androidpackagecreationstep.h"
#include <projectexplorer/customexecutablerunconfiguration.h>
#include <qt4projectmanager/qt4nodes.h> #include <qt4projectmanager/qt4nodes.h>
#include <qt4projectmanager/qt4project.h> #include <qt4projectmanager/qt4project.h>
#include <qt4projectmanager/qt4projectmanagerconstants.h> #include <qt4projectmanager/qt4projectmanagerconstants.h>
#include <qt4projectmanager/qt4target.h> #include <qt4projectmanager/qt4target.h>
#include <qt4projectmanager/qt4buildconfiguration.h> #include <qt4projectmanager/qt4buildconfiguration.h>
#include <qtsupport/customexecutablerunconfiguration.h>
#include <QDir> #include <QDir>
#include <QFileSystemWatcher> #include <QFileSystemWatcher>
...@@ -120,7 +120,7 @@ void AndroidTarget::createApplicationProFiles(bool reparse) ...@@ -120,7 +120,7 @@ void AndroidTarget::createApplicationProFiles(bool reparse)
// Oh still none? Add a custom executable runconfiguration // Oh still none? Add a custom executable runconfiguration
if (runConfigurations().isEmpty()) { if (runConfigurations().isEmpty()) {
addRunConfiguration(new ProjectExplorer::CustomExecutableRunConfiguration(this)); addRunConfiguration(new QtSupport::CustomExecutableRunConfiguration(this));
} }
} }
......
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
#include <projectexplorer/deployconfiguration.h> #include <projectexplorer/deployconfiguration.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/customexecutablerunconfiguration.h>
#include <qt4projectmanager/buildconfigurationinfo.h> #include <qt4projectmanager/buildconfigurationinfo.h>
#include <qtsupport/customexecutablerunconfiguration.h>
#include <qtsupport/qtversionmanager.h> #include <qtsupport/qtversionmanager.h>
...@@ -173,7 +173,7 @@ Qt4BaseTarget *AndroidTargetFactory::create(ProjectExplorer::Project *parent, co ...@@ -173,7 +173,7 @@ Qt4BaseTarget *AndroidTargetFactory::create(ProjectExplorer::Project *parent, co
target->createApplicationProFiles(false); target->createApplicationProFiles(false);
if (target->runConfigurations().isEmpty()) if (target->runConfigurations().isEmpty())
target->addRunConfiguration(new ProjectExplorer::CustomExecutableRunConfiguration(target)); target->addRunConfiguration(new QtSupport::CustomExecutableRunConfiguration(target));
return target; return target;
} }
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
<dependencyList> <dependencyList>
<dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/> <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/> <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"QtSupport\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/> <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
</dependencyList> </dependencyList>
</plugin> </plugin>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
#include <projectexplorer/buildsteplist.h> #include <projectexplorer/buildsteplist.h>
#include <projectexplorer/toolchain.h> #include <projectexplorer/toolchain.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/customexecutablerunconfiguration.h> #include <qtsupport/customexecutablerunconfiguration.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <QInputDialog> #include <QInputDialog>
...@@ -173,7 +173,7 @@ AutotoolsBuildConfiguration *AutotoolsBuildConfigurationFactory::create(Target * ...@@ -173,7 +173,7 @@ AutotoolsBuildConfiguration *AutotoolsBuildConfigurationFactory::create(Target *
t->addDeployConfiguration(t->createDeployConfiguration(Core::Id(DEFAULT_DEPLOYCONFIGURATION_ID))); t->addDeployConfiguration(t->createDeployConfiguration(Core::Id(DEFAULT_DEPLOYCONFIGURATION_ID)));
// User needs to choose where the executable file is. // User needs to choose where the executable file is.
// TODO: Parse the file in *Anjuta style* to be able to add custom RunConfigurations. // TODO: Parse the file in *Anjuta style* to be able to add custom RunConfigurations.
t->addRunConfiguration(new CustomExecutableRunConfiguration(t)); t->addRunConfiguration(new QtSupport::CustomExecutableRunConfiguration(t));
return bc; return bc;
} }
......
include(../../plugins/projectexplorer/projectexplorer.pri) include(../../plugins/projectexplorer/projectexplorer.pri)
include(../../plugins/coreplugin/coreplugin.pri) include(../../plugins/coreplugin/coreplugin.pri)
include(../../plugins/cpptools/cpptools.pri) include(../../plugins/cpptools/cpptools.pri)
include(../../plugins/qtsupport/qtsupport.pri)
...@@ -42,9 +42,9 @@ ...@@ -42,9 +42,9 @@
#include "autoreconfstep.h" #include "autoreconfstep.h"
#include "configurestep.h" #include "configurestep.h"
#include <projectexplorer/customexecutablerunconfiguration.h>
#include <projectexplorer/buildsteplist.h> #include <projectexplorer/buildsteplist.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <qtsupport/customexecutablerunconfiguration.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <QApplication> #include <QApplication>
...@@ -152,7 +152,7 @@ AutotoolsTarget *AutotoolsTargetFactory::create(Project *parent, const Core::Id ...@@ -152,7 +152,7 @@ AutotoolsTarget *AutotoolsTargetFactory::create(Project *parent, const Core::Id
t->addDeployConfiguration(t->createDeployConfiguration(Core::Id(ProjectExplorer::Constants::DEFAULT_DEPLOYCONFIGURATION_ID))); t->addDeployConfiguration(t->createDeployConfiguration(Core::Id(ProjectExplorer::Constants::DEFAULT_DEPLOYCONFIGURATION_ID)));
// User needs to choose where the executable file is. // User needs to choose where the executable file is.
// TODO: Parse the file in *Anjuta style* to be able to add custom RunConfigurations. // TODO: Parse the file in *Anjuta style* to be able to add custom RunConfigurations.
t->addRunConfiguration(new CustomExecutableRunConfiguration(t)); t->addRunConfiguration(new QtSupport::CustomExecutableRunConfiguration(t));
return t; return t;
} }
......
...@@ -17,6 +17,7 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General ...@@ -17,6 +17,7 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/> <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/> <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/> <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"QtSupport\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"Designer\" version=\"$$QTCREATOR_VERSION\" type=\"optional\"/> <dependency name=\"Designer\" version=\"$$QTCREATOR_VERSION\" type=\"optional\"/>
</dependencyList> </dependencyList>
</plugin> </plugin>
...@@ -12,6 +12,7 @@ QtcPlugin { ...@@ -12,6 +12,7 @@ QtcPlugin {
Depends { name: "CPlusPlus" } Depends { name: "CPlusPlus" }
Depends { name: "TextEditor" } Depends { name: "TextEditor" }
Depends { name: "Locator" } Depends { name: "Locator" }
Depends { name: "QtSupport" }
Depends { name: "cpp" } Depends { name: "cpp" }
cpp.includePaths: [ cpp.includePaths: [
......
include(../../plugins/projectexplorer/projectexplorer.pri) include(../../plugins/projectexplorer/projectexplorer.pri)
include(../../plugins/cpptools/cpptools.pri) include(../../plugins/cpptools/cpptools.pri)
include(../../plugins/texteditor/texteditor.pri) include(../../plugins/texteditor/texteditor.pri)
include(../../plugins/qtsupport/qtsupport.pri)
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <coreplugin/helpmanager.h> #include <coreplugin/helpmanager.h>
#include <projectexplorer/debugginghelper.h> #include <qtsupport/debugginghelper.h>
#include <projectexplorer/environmentwidget.h> #include <projectexplorer/environmentwidget.h>
#include <utils/pathchooser.h> #include <utils/pathchooser.h>
...@@ -242,17 +242,17 @@ void CMakeRunConfiguration::setCommandLineArguments(const QString &newText) ...@@ -242,17 +242,17 @@ void CMakeRunConfiguration::setCommandLineArguments(const QString &newText)
QString CMakeRunConfiguration::dumperLibrary() const QString CMakeRunConfiguration::dumperLibrary() const
{ {
Utils::FileName qmakePath = ProjectExplorer::DebuggingHelperLibrary::findSystemQt(environment()); Utils::FileName qmakePath = QtSupport::DebuggingHelperLibrary::findSystemQt(environment());
QString qtInstallData = ProjectExplorer::DebuggingHelperLibrary::qtInstallDataDir(qmakePath); QString qtInstallData = QtSupport::DebuggingHelperLibrary::qtInstallDataDir(qmakePath);
QString dhl = ProjectExplorer::DebuggingHelperLibrary::debuggingHelperLibraryByInstallData(qtInstallData); QString dhl = QtSupport::DebuggingHelperLibrary::debuggingHelperLibraryByInstallData(qtInstallData);
return dhl; return dhl;
} }
QStringList CMakeRunConfiguration::dumperLibraryLocations() const QStringList CMakeRunConfiguration::dumperLibraryLocations() const
{ {
Utils::FileName qmakePath = ProjectExplorer::DebuggingHelperLibrary::findSystemQt(environment()); Utils::FileName qmakePath = QtSupport::DebuggingHelperLibrary::findSystemQt(environment());
QString qtInstallData = ProjectExplorer::DebuggingHelperLibrary::qtInstallDataDir(qmakePath); QString qtInstallData = QtSupport::DebuggingHelperLibrary::qtInstallDataDir(qmakePath);
return ProjectExplorer::DebuggingHelperLibrary::debuggingHelperLibraryDirectories(qtInstallData); return QtSupport::DebuggingHelperLibrary::debuggingHelperLibraryDirectories(qtInstallData);
} }
Utils::Environment CMakeRunConfiguration::baseEnvironment() const Utils::Environment CMakeRunConfiguration::baseEnvironment() const
......
...@@ -38,8 +38,8 @@ ...@@ -38,8 +38,8 @@
#include <projectexplorer/buildsteplist.h> #include <projectexplorer/buildsteplist.h>
#include <projectexplorer/deployconfiguration.h> #include <projectexplorer/deployconfiguration.h>
#include <projectexplorer/customexecutablerunconfiguration.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <qtsupport/customexecutablerunconfiguration.h>
#include <QApplication> #include <QApplication>
#include <QStyle> #include <QStyle>
...@@ -117,8 +117,8 @@ void CMakeTarget::updateRunConfigurations() ...@@ -117,8 +117,8 @@ void CMakeTarget::updateRunConfigurations()
foreach (ProjectExplorer::RunConfiguration* rc, runConfigurations()) { foreach (ProjectExplorer::RunConfiguration* rc, runConfigurations()) {
if (CMakeRunConfiguration* cmakeRC = qobject_cast<CMakeRunConfiguration *>(rc)) if (CMakeRunConfiguration* cmakeRC = qobject_cast<CMakeRunConfiguration *>(rc))
existingRunConfigurations.insert(cmakeRC->title(), cmakeRC); existingRunConfigurations.insert(cmakeRC->title(), cmakeRC);
ProjectExplorer::CustomExecutableRunConfiguration *ceRC = QtSupport::CustomExecutableRunConfiguration *ceRC =
qobject_cast<ProjectExplorer::CustomExecutableRunConfiguration *>(rc); qobject_cast<QtSupport::CustomExecutableRunConfiguration *>(rc);
if (ceRC && !ceRC->isConfigured()) if (ceRC && !ceRC->isConfigured())
toRemove << rc; toRemove << rc;
} }
...@@ -160,8 +160,7 @@ void CMakeTarget::updateRunConfigurations() ...@@ -160,8 +160,7 @@ void CMakeTarget::updateRunConfigurations()
if (runConfigurations().isEmpty()) { if (runConfigurations().isEmpty()) {
// Oh no, no run configuration, // Oh no, no run configuration,
// create a custom executable run configuration // create a custom executable run configuration
ProjectExplorer::CustomExecutableRunConfiguration *rc = new ProjectExplorer::CustomExecutableRunConfiguration(this); addRunConfiguration(new QtSupport::CustomExecutableRunConfiguration(this));
addRunConfiguration(rc);
} }
} }
......
...@@ -51,7 +51,6 @@ ...@@ -51,7 +51,6 @@
#endif #endif
#include <projectexplorer/abi.h> #include <projectexplorer/abi.h>
#include <projectexplorer/debugginghelper.h>
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
......
...@@ -17,5 +17,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General ...@@ -17,5 +17,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/> <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/> <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/> <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"QtSupport\" version=\"$$QTCREATOR_VERSION\"/>
</dependencyList> </dependencyList>
</plugin> </plugin>
...@@ -39,9 +39,9 @@ ...@@ -39,9 +39,9 @@
#include <projectexplorer/abi.h> #include <projectexplorer/abi.h>
#include <projectexplorer/buildenvironmentwidget.h> #include <projectexplorer/buildenvironmentwidget.h>
#include <projectexplorer/headerpath.h> #include <projectexplorer/headerpath.h>
#include <projectexplorer/customexecutablerunconfiguration.h>
#include <projectexplorer/toolchainmanager.h> #include <projectexplorer/toolchainmanager.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <qtsupport/customexecutablerunconfiguration.h>
#include <cpptools/ModelManagerInterface.h> #include <cpptools/ModelManagerInterface.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <utils/pathchooser.h> #include <utils/pathchooser.h>
...@@ -477,7 +477,7 @@ bool GenericProject::fromMap(const QVariantMap &map) ...@@ -477,7 +477,7 @@ bool GenericProject::fromMap(const QVariantMap &map)
continue; continue;
} }
if (!t->activeRunConfiguration()) if (!t->activeRunConfiguration())
t->addRunConfiguration(new CustomExecutableRunConfiguration(t)); t->addRunConfiguration(new QtSupport::CustomExecutableRunConfiguration(t));
} }
// Add default setup: // Add default setup:
......
...@@ -13,6 +13,7 @@ QtcPlugin { ...@@ -13,6 +13,7 @@ QtcPlugin {
Depends { name: "ProjectExplorer" } Depends { name: "ProjectExplorer" }
Depends { name: "Find" } Depends { name: "Find" }
Depends { name: "Locator" } Depends { name: "Locator" }
Depends { name: "QtSupport" }
Depends { name: "cpp" } Depends { name: "cpp" }
cpp.includePaths: [ cpp.includePaths: [
......
include(../../plugins/projectexplorer/projectexplorer.pri) include(../../plugins/projectexplorer/projectexplorer.pri)
include(../../plugins/cpptools/cpptools.pri) include(../../plugins/cpptools/cpptools.pri)
include(../../plugins/texteditor/texteditor.pri) include(../../plugins/texteditor/texteditor.pri)
include(../../plugins/qtsupport/qtsupport.pri)
...@@ -37,9 +37,9 @@ ...@@ -37,9 +37,9 @@
#include "genericmakestep.h" #include "genericmakestep.h"
#include <projectexplorer/buildsteplist.h> #include <projectexplorer/buildsteplist.h>
#include <projectexplorer/customexecutablerunconfiguration.h>
#include <projectexplorer/deployconfiguration.h> #include <projectexplorer/deployconfiguration.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <qtsupport/customexecutablerunconfiguration.h>
#include <QApplication> #include <QApplication>
#include <QStyle> #include <QStyle>
...@@ -153,7 +153,7 @@ GenericTarget *GenericTargetFactory::create(ProjectExplorer::Project *parent, co ...@@ -153,7 +153,7 @@ GenericTarget *GenericTargetFactory::create(ProjectExplorer::Project *parent, co
// Add a runconfiguration. The CustomExecutableRC one will query the user // Add a runconfiguration. The CustomExecutableRC one will query the user
// for its settings, so it is a good choice here. // for its settings, so it is a good choice here.
t->addRunConfiguration(new ProjectExplorer::CustomExecutableRunConfiguration(t)); t->addRunConfiguration(new QtSupport::CustomExecutableRunConfiguration(t));
return t; return t;
} }
......
...@@ -44,7 +44,6 @@ ...@@ -44,7 +44,6 @@
#include <coreplugin/iversioncontrol.h> #include <coreplugin/iversioncontrol.h>
#include <coreplugin/vcsmanager.h> #include <coreplugin/vcsmanager.h>
#include <projectexplorer/abi.h> #include <projectexplorer/abi.h>
#include <projectexplorer/customexecutablerunconfiguration.h>
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <projectexplorer/projectnodes.h> #include <projectexplorer/projectnodes.h>
#include <projectexplorer/toolchain.h> #include <projectexplorer/toolchain.h>
...@@ -52,6 +51,7 @@ ...@@ -52,6 +51,7 @@
#include <qt4projectmanager/qt4buildconfiguration.h> #include <qt4projectmanager/qt4buildconfiguration.h>
#include <qt4projectmanager/qt4nodes.h> #include <qt4projectmanager/qt4nodes.h>
#include <qtsupport/baseqtversion.h> #include <qtsupport/baseqtversion.h>
#include <qtsupport/customexecutablerunconfiguration.h>
#include <remotelinux/deploymentsettingsassistant.h> #include <remotelinux/deploymentsettingsassistant.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/filesystemwatcher.h> #include <utils/filesystemwatcher.h>
...@@ -180,7 +180,7 @@ void AbstractQt4MaemoTarget::createApplicationProFiles(bool reparse) ...@@ -180,7 +180,7 @@ void AbstractQt4MaemoTarget::createApplicationProFiles(bool reparse)
// Oh still none? Add a custom executable runconfiguration // Oh still none? Add a custom executable runconfiguration
if (runConfigurations().isEmpty()) { if (runConfigurations().isEmpty()) {
addRunConfiguration(new ProjectExplorer::CustomExecutableRunConfiguration(this)); addRunConfiguration(new QtSupport::CustomExecutableRunConfiguration(this));
} }
} }
......
...@@ -38,10 +38,10 @@ ...@@ -38,10 +38,10 @@
#include <projectexplorer/deployconfiguration.h> #include <projectexplorer/deployconfiguration.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/customexecutablerunconfiguration.h>
#include <qt4projectmanager/buildconfigurationinfo.h> #include <qt4projectmanager/buildconfigurationinfo.h>
#include <qt4projectmanager/qt4project.h> #include <qt4projectmanager/qt4project.h>
#include <qt4projectmanager/qt4projectmanagerconstants.h> #include <qt4projectmanager/qt4projectmanagerconstants.h>
#include <qtsupport/customexecutablerunconfiguration.h>
#include <qtsupport/qtversionmanager.h> #include <qtsupport/qtversionmanager.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
...@@ -217,7 +217,7 @@ ProjectExplorer::Target *Qt4MaemoTargetFactory::create(ProjectExplorer::Project ...@@ -217,7 +217,7 @@ ProjectExplorer::Target *Qt4MaemoTargetFactory::create(ProjectExplorer::Project
} }
target->createApplicationProFiles(false); target->createApplicationProFiles(false);
if (target->runConfigurations().isEmpty()) if (target->runConfigurations().isEmpty())
target->addRunConfiguration(new ProjectExplorer::CustomExecutableRunConfiguration(target)); target->addRunConfiguration(new QtSupport::CustomExecutableRunConfiguration(target));
return target; return target;
} }
......
...@@ -225,16 +225,19 @@ plugin_cmakeprojectmanager.subdir = cmakeprojectmanager ...@@ -225,16 +225,19 @@ plugin_cmakeprojectmanager.subdir = cmakeprojectmanager
plugin_cmakeprojectmanager.depends = plugin_texteditor plugin_cmakeprojectmanager.depends = plugin_texteditor
plugin_cmakeprojectmanager.depends += plugin_projectexplorer plugin_cmakeprojectmanager.depends += plugin_projectexplorer
plugin_cmakeprojectmanager.depends += plugin_cpptools plugin_cmakeprojectmanager.depends += plugin_cpptools
plugin_cmakeprojectmanager.depends += plugin_qtsupport
plugin_autotoolsprojectmanager.subdir = autotoolsprojectmanager plugin_autotoolsprojectmanager.subdir = autotoolsprojectmanager
plugin_autotoolsprojectmanager.depends = plugin_projectexplorer plugin_autotoolsprojectmanager.depends = plugin_projectexplorer
plugin_autotoolsprojectmanager.depends += plugin_coreplugin plugin_autotoolsprojectmanager.depends += plugin_coreplugin
plugin_autotoolsprojectmanager.depends += plugin_cpptools plugin_autotoolsprojectmanager.depends += plugin_cpptools
plugin_autotoolsprojectmanager.depends += plugin_qtsupport
plugin_genericprojectmanager.subdir = genericprojectmanager plugin_genericprojectmanager.subdir = genericprojectmanager
plugin_genericprojectmanager.depends = plugin_texteditor plugin_genericprojectmanager.depends = plugin_texteditor
plugin_genericprojectmanager.depends += plugin_projectexplorer plugin_genericprojectmanager.depends += plugin_projectexplorer
plugin_genericprojectmanager.depends += plugin_cpptools plugin_genericprojectmanager.depends += plugin_cpptools
plugin_genericprojectmanager.depends += plugin_qtsupport
plugin_qmljseditor.subdir = qmljseditor plugin_qmljseditor.subdir = qmljseditor
plugin_qmljseditor.depends = plugin_texteditor plugin_qmljseditor.depends = plugin_texteditor
......
...@@ -51,7 +51,6 @@ ...@@ -51,7 +51,6 @@
#include "buildsettingspropertiespage.h" #include "buildsettingspropertiespage.h"
#include "currentprojectfind.h" #include "currentprojectfind.h"
#include "currentprojectfilter.h" #include "currentprojectfilter.h"
#include "customexecutablerunconfiguration.h"
#include "editorsettingspropertiespage.h" #include "editorsettingspropertiespage.h"
#include "codestylesettingspropertiespage.h" #include "codestylesettingspropertiespage.h"
#include "dependenciespanel.h" #include "dependenciespanel.h"
...@@ -421,7 +420,6 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er ...@@ -421,7 +420,6 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
addAutoReleasedObject(currentProjectFind); addAutoReleasedObject(currentProjectFind);
addAutoReleasedObject(new LocalApplicationRunControlFactory); addAutoReleasedObject(new LocalApplicationRunControlFactory);
addAutoReleasedObject(new CustomExecutableRunConfigurationFactory);
addAutoReleasedObject(new ProjectFileWizardExtension); addAutoReleasedObject(new ProjectFileWizardExtension);
......
...@@ -64,7 +64,6 @@ HEADERS += projectexplorer.h \ ...@@ -64,7 +64,6 @@ HEADERS += projectexplorer.h \
runsettingspropertiespage.h \ runsettingspropertiespage.h \
projecttreewidget.h \ projecttreewidget.h \
foldernavigationwidget.h \ foldernavigationwidget.h \
customexecutablerunconfiguration.h \
buildprogress.h \ buildprogress.h \
projectnodes.h \ projectnodes.h \
sessiondialog.h \ sessiondialog.h \
...@@ -80,7 +79,6 @@ HEADERS += projectexplorer.h \ ...@@ -80,7 +79,6 @@ HEADERS += projectexplorer.h \
toolchainoptionspage.h \ toolchainoptionspage.h \
cesdkhandler.h \ cesdkhandler.h \
gccparser.h \ gccparser.h \
debugginghelper.h \
projectexplorersettingspage.h \ projectexplorersettingspage.h \
projectwelcomepage.h \ projectwelcomepage.h \
baseprojectwizarddialog.h \ baseprojectwizarddialog.h \
...@@ -97,7 +95,6 @@ HEADERS += projectexplorer.h \ ...@@ -97,7 +95,6 @@ HEADERS += projectexplorer.h \
abstractprocessstep.h \ abstractprocessstep.h \
taskhub.h \ taskhub.h \
localapplicationruncontrol.h \ localapplicationruncontrol.h \
customexecutableconfigurationwidget.h \
metatypedeclarations.h \ metatypedeclarations.h \
publishing/publishingwizardselectiondialog.h \ publishing/publishingwizardselectiondialog.h \
publishing/ipublishingwizardfactory.h \ publishing/ipublishingwizardfactory.h \
...@@ -164,7 +161,6 @@ SOURCES += projectexplorer.cpp \ ...@@ -164,7 +161,6 @@ SOURCES += projectexplorer.cpp \
runsettingspropertiespage.cpp \ runsettingspropertiespage.cpp \
projecttreewidget.cpp \ projecttreewidget.cpp \
foldernavigationwidget.cpp \ foldernavigationwidget.cpp \
customexecutablerunconfiguration.cpp \
buildprogress.cpp \ buildprogress.cpp \
projectnodes.cpp \ projectnodes.cpp \
sessiondialog.cpp \ sessiondialog.cpp \
...@@ -180,7 +176,6 @@ SOURCES += projectexplorer.cpp \ ...@@ -180,7 +176,6 @@ SOURCES += projectexplorer.cpp \
toolchainoptionspage.cpp \ toolchainoptionspage.cpp \
cesdkhandler.cpp \ cesdkhandler.cpp \
gccparser.cpp \ gccparser.cpp \
debugginghelper.cpp \
projectexplorersettingspage.cpp \ projectexplorersettingspage.cpp \
projectwelcomepage.cpp \ projectwelcomepage.cpp \
corelistenercheckingforrunningbuild.cpp \ corelistenercheckingforrunningbuild.cpp \
...@@ -197,7 +192,6 @@ SOURCES += projectexplorer.cpp \ ...@@ -197,7 +192,6 @@ SOURCES += projectexplorer.cpp \
taskhub.cpp \ taskhub.cpp \
processparameters.cpp \ processparameters.cpp \
localapplicationruncontrol.cpp \ localapplicationruncontrol.cpp \
customexecutableconfigurationwidget.cpp \