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: Daniel Teske <daniel.teske@nokia.com>

src/plugins/android/androidtarget.cpp

@@ -38,12 +38,12 @@
 #include "androidglobal.h"
 #include "androidpackagecreationstep.h"
 
-#include <projectexplorer/customexecutablerunconfiguration.h>
 #include <qt4projectmanager/qt4nodes.h>
 #include <qt4projectmanager/qt4project.h>
 #include <qt4projectmanager/qt4projectmanagerconstants.h>
 #include <qt4projectmanager/qt4target.h>
 #include <qt4projectmanager/qt4buildconfiguration.h>
+#include <qtsupport/customexecutablerunconfiguration.h>
 
 #include <QDir>
 #include <QFileSystemWatcher>
@@ -120,7 +120,7 @@ void AndroidTarget::createApplicationProFiles(bool reparse)
 
     // Oh still none? Add a custom executable runconfiguration
     if (runConfigurations().isEmpty()) {
-        addRunConfiguration(new ProjectExplorer::CustomExecutableRunConfiguration(this));
+        addRunConfiguration(new QtSupport::CustomExecutableRunConfiguration(this));
     }
 }
 

src/plugins/android/androidtargetfactory.cpp

@@ -42,8 +42,8 @@
 
 #include <projectexplorer/deployconfiguration.h>
 #include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/customexecutablerunconfiguration.h>
 #include <qt4projectmanager/buildconfigurationinfo.h>
+#include <qtsupport/customexecutablerunconfiguration.h>
 
 #include <qtsupport/qtversionmanager.h>
 
@@ -173,7 +173,7 @@ Qt4BaseTarget *AndroidTargetFactory::create(ProjectExplorer::Project *parent, co
 
     target->createApplicationProFiles(false);
     if (target->runConfigurations().isEmpty())
-        target->addRunConfiguration(new ProjectExplorer::CustomExecutableRunConfiguration(target));
+        target->addRunConfiguration(new QtSupport::CustomExecutableRunConfiguration(target));
     return target;
 }
 

src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in

@@ -18,6 +18,7 @@
     <dependencyList>
         <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
         <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"QtSupport\" version=\"$$QTCREATOR_VERSION\"/>
         <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>

src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp

@@ -44,7 +44,7 @@
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/toolchain.h>
 #include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/customexecutablerunconfiguration.h>
+#include <qtsupport/customexecutablerunconfiguration.h>
 #include <utils/qtcassert.h>
 
 #include <QInputDialog>
@@ -173,7 +173,7 @@ AutotoolsBuildConfiguration *AutotoolsBuildConfigurationFactory::create(Target *
     t->addDeployConfiguration(t->createDeployConfiguration(Core::Id(DEFAULT_DEPLOYCONFIGURATION_ID)));
     // User needs to choose where the executable file is.
     // 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;
 }

src/plugins/autotoolsprojectmanager/autotoolsprojectmanager_dependencies.pri

 include(../../plugins/projectexplorer/projectexplorer.pri)
 include(../../plugins/coreplugin/coreplugin.pri)
 include(../../plugins/cpptools/cpptools.pri)
+include(../../plugins/qtsupport/qtsupport.pri)

src/plugins/autotoolsprojectmanager/autotoolstarget.cpp

@@ -42,9 +42,9 @@
 #include "autoreconfstep.h"
 #include "configurestep.h"
 
-#include <projectexplorer/customexecutablerunconfiguration.h>
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/projectexplorerconstants.h>
+#include <qtsupport/customexecutablerunconfiguration.h>
 #include <extensionsystem/pluginmanager.h>
 
 #include <QApplication>
@@ -152,7 +152,7 @@ AutotoolsTarget *AutotoolsTargetFactory::create(Project *parent, const Core::Id
     t->addDeployConfiguration(t->createDeployConfiguration(Core::Id(ProjectExplorer::Constants::DEFAULT_DEPLOYCONFIGURATION_ID)));
     // User needs to choose where the executable file is.
     // 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;
 }

src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in

@@ -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=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
         <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"QtSupport\" version=\"$$QTCREATOR_VERSION\"/>
         <dependency name=\"Designer\" version=\"$$QTCREATOR_VERSION\" type=\"optional\"/>
     </dependencyList>
 </plugin>

src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs

@@ -12,6 +12,7 @@ QtcPlugin {
     Depends { name: "CPlusPlus" }
     Depends { name: "TextEditor" }
     Depends { name: "Locator" }
+    Depends { name: "QtSupport" }
 
     Depends { name: "cpp" }
     cpp.includePaths: [

src/plugins/cmakeprojectmanager/cmakeprojectmanager_dependencies.pri

 include(../../plugins/projectexplorer/projectexplorer.pri)
 include(../../plugins/cpptools/cpptools.pri)
 include(../../plugins/texteditor/texteditor.pri)
+include(../../plugins/qtsupport/qtsupport.pri)

src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp

@@ -39,7 +39,7 @@
 
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/helpmanager.h>
-#include <projectexplorer/debugginghelper.h>
+#include <qtsupport/debugginghelper.h>
 #include <projectexplorer/environmentwidget.h>
 
 #include <utils/pathchooser.h>
@@ -242,17 +242,17 @@ void CMakeRunConfiguration::setCommandLineArguments(const QString &newText)
 
 QString CMakeRunConfiguration::dumperLibrary() const
 {
-    Utils::FileName qmakePath = ProjectExplorer::DebuggingHelperLibrary::findSystemQt(environment());
-    QString qtInstallData = ProjectExplorer::DebuggingHelperLibrary::qtInstallDataDir(qmakePath);
-    QString dhl = ProjectExplorer::DebuggingHelperLibrary::debuggingHelperLibraryByInstallData(qtInstallData);
+    Utils::FileName qmakePath = QtSupport::DebuggingHelperLibrary::findSystemQt(environment());
+    QString qtInstallData = QtSupport::DebuggingHelperLibrary::qtInstallDataDir(qmakePath);
+    QString dhl = QtSupport::DebuggingHelperLibrary::debuggingHelperLibraryByInstallData(qtInstallData);
     return dhl;
 }
 
 QStringList CMakeRunConfiguration::dumperLibraryLocations() const
 {
-    Utils::FileName qmakePath = ProjectExplorer::DebuggingHelperLibrary::findSystemQt(environment());
-    QString qtInstallData = ProjectExplorer::DebuggingHelperLibrary::qtInstallDataDir(qmakePath);
-    return ProjectExplorer::DebuggingHelperLibrary::debuggingHelperLibraryDirectories(qtInstallData);
+    Utils::FileName qmakePath = QtSupport::DebuggingHelperLibrary::findSystemQt(environment());
+    QString qtInstallData = QtSupport::DebuggingHelperLibrary::qtInstallDataDir(qmakePath);
+    return QtSupport::DebuggingHelperLibrary::debuggingHelperLibraryDirectories(qtInstallData);
 }
 
 Utils::Environment CMakeRunConfiguration::baseEnvironment() const

src/plugins/cmakeprojectmanager/cmaketarget.cpp

@@ -38,8 +38,8 @@
 
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/deployconfiguration.h>
-#include <projectexplorer/customexecutablerunconfiguration.h>
 #include <projectexplorer/projectexplorerconstants.h>
+#include <qtsupport/customexecutablerunconfiguration.h>
 
 #include <QApplication>
 #include <QStyle>
@@ -117,8 +117,8 @@ void CMakeTarget::updateRunConfigurations()
     foreach (ProjectExplorer::RunConfiguration* rc, runConfigurations()) {
         if (CMakeRunConfiguration* cmakeRC = qobject_cast<CMakeRunConfiguration *>(rc))
             existingRunConfigurations.insert(cmakeRC->title(), cmakeRC);
-        ProjectExplorer::CustomExecutableRunConfiguration *ceRC =
-                qobject_cast<ProjectExplorer::CustomExecutableRunConfiguration *>(rc);
+        QtSupport::CustomExecutableRunConfiguration *ceRC =
+                qobject_cast<QtSupport::CustomExecutableRunConfiguration *>(rc);
         if (ceRC && !ceRC->isConfigured())
             toRemove << rc;
     }
@@ -160,8 +160,7 @@ void CMakeTarget::updateRunConfigurations()
     if (runConfigurations().isEmpty()) {
         // Oh no, no run configuration,
         // create a custom executable run configuration
-        ProjectExplorer::CustomExecutableRunConfiguration *rc = new ProjectExplorer::CustomExecutableRunConfiguration(this);
-        addRunConfiguration(rc);
+        addRunConfiguration(new QtSupport::CustomExecutableRunConfiguration(this));
     }
 }
 

src/plugins/debugger/debuggerrunner.cpp

@@ -51,7 +51,6 @@
 #endif
 
 #include <projectexplorer/abi.h>
-#include <projectexplorer/debugginghelper.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>

src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in

@@ -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=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
         <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"QtSupport\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>

src/plugins/genericprojectmanager/genericproject.cpp

@@ -39,9 +39,9 @@
 #include <projectexplorer/abi.h>
 #include <projectexplorer/buildenvironmentwidget.h>
 #include <projectexplorer/headerpath.h>
-#include <projectexplorer/customexecutablerunconfiguration.h>
 #include <projectexplorer/toolchainmanager.h>
 #include <projectexplorer/projectexplorerconstants.h>
+#include <qtsupport/customexecutablerunconfiguration.h>
 #include <cpptools/ModelManagerInterface.h>
 #include <extensionsystem/pluginmanager.h>
 #include <utils/pathchooser.h>
@@ -477,7 +477,7 @@ bool GenericProject::fromMap(const QVariantMap &map)
             continue;
         }
         if (!t->activeRunConfiguration())
-            t->addRunConfiguration(new CustomExecutableRunConfiguration(t));
+            t->addRunConfiguration(new QtSupport::CustomExecutableRunConfiguration(t));
     }
 
     // Add default setup:

src/plugins/genericprojectmanager/genericprojectmanager.qbs

@@ -13,6 +13,7 @@ QtcPlugin {
     Depends { name: "ProjectExplorer" }
     Depends { name: "Find" }
     Depends { name: "Locator" }
+    Depends { name: "QtSupport" }
 
     Depends { name: "cpp" }
     cpp.includePaths: [

src/plugins/genericprojectmanager/genericprojectmanager_dependencies.pri

 include(../../plugins/projectexplorer/projectexplorer.pri)
 include(../../plugins/cpptools/cpptools.pri)
 include(../../plugins/texteditor/texteditor.pri)
+include(../../plugins/qtsupport/qtsupport.pri)

src/plugins/genericprojectmanager/generictarget.cpp

@@ -37,9 +37,9 @@
 #include "genericmakestep.h"
 
 #include <projectexplorer/buildsteplist.h>
-#include <projectexplorer/customexecutablerunconfiguration.h>
 #include <projectexplorer/deployconfiguration.h>
 #include <projectexplorer/projectexplorerconstants.h>
+#include <qtsupport/customexecutablerunconfiguration.h>
 
 #include <QApplication>
 #include <QStyle>
@@ -153,7 +153,7 @@ GenericTarget *GenericTargetFactory::create(ProjectExplorer::Project *parent, co
 
     // Add a runconfiguration. The CustomExecutableRC one will query the user
     // for its settings, so it is a good choice here.
-    t->addRunConfiguration(new ProjectExplorer::CustomExecutableRunConfiguration(t));
+    t->addRunConfiguration(new QtSupport::CustomExecutableRunConfiguration(t));
 
     return t;
 }

src/plugins/madde/qt4maemotarget.cpp

@@ -44,7 +44,6 @@
 #include <coreplugin/iversioncontrol.h>
 #include <coreplugin/vcsmanager.h>
 #include <projectexplorer/abi.h>
-#include <projectexplorer/customexecutablerunconfiguration.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectnodes.h>
 #include <projectexplorer/toolchain.h>
@@ -52,6 +51,7 @@
 #include <qt4projectmanager/qt4buildconfiguration.h>
 #include <qt4projectmanager/qt4nodes.h>
 #include <qtsupport/baseqtversion.h>
+#include <qtsupport/customexecutablerunconfiguration.h>
 #include <remotelinux/deploymentsettingsassistant.h>
 #include <utils/fileutils.h>
 #include <utils/filesystemwatcher.h>
@@ -180,7 +180,7 @@ void AbstractQt4MaemoTarget::createApplicationProFiles(bool reparse)
 
     // Oh still none? Add a custom executable runconfiguration
     if (runConfigurations().isEmpty()) {
-        addRunConfiguration(new ProjectExplorer::CustomExecutableRunConfiguration(this));
+        addRunConfiguration(new QtSupport::CustomExecutableRunConfiguration(this));
     }
 }
 

src/plugins/madde/qt4maemotargetfactory.cpp

@@ -38,10 +38,10 @@
 
 #include <projectexplorer/deployconfiguration.h>
 #include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/customexecutablerunconfiguration.h>
 #include <qt4projectmanager/buildconfigurationinfo.h>
 #include <qt4projectmanager/qt4project.h>
 #include <qt4projectmanager/qt4projectmanagerconstants.h>
+#include <qtsupport/customexecutablerunconfiguration.h>
 #include <qtsupport/qtversionmanager.h>
 #include <utils/qtcassert.h>
 
@@ -217,7 +217,7 @@ ProjectExplorer::Target *Qt4MaemoTargetFactory::create(ProjectExplorer::Project
     }
     target->createApplicationProFiles(false);
     if (target->runConfigurations().isEmpty())
-        target->addRunConfiguration(new ProjectExplorer::CustomExecutableRunConfiguration(target));
+        target->addRunConfiguration(new QtSupport::CustomExecutableRunConfiguration(target));
     return target;
 }
 

src/plugins/plugins.pro

@@ -225,16 +225,19 @@ plugin_cmakeprojectmanager.subdir = cmakeprojectmanager
 plugin_cmakeprojectmanager.depends = plugin_texteditor
 plugin_cmakeprojectmanager.depends += plugin_projectexplorer
 plugin_cmakeprojectmanager.depends += plugin_cpptools
+plugin_cmakeprojectmanager.depends += plugin_qtsupport
 
 plugin_autotoolsprojectmanager.subdir = autotoolsprojectmanager
 plugin_autotoolsprojectmanager.depends = plugin_projectexplorer
 plugin_autotoolsprojectmanager.depends += plugin_coreplugin
 plugin_autotoolsprojectmanager.depends += plugin_cpptools
+plugin_autotoolsprojectmanager.depends += plugin_qtsupport
 
 plugin_genericprojectmanager.subdir = genericprojectmanager
 plugin_genericprojectmanager.depends = plugin_texteditor
 plugin_genericprojectmanager.depends += plugin_projectexplorer
 plugin_genericprojectmanager.depends += plugin_cpptools
+plugin_genericprojectmanager.depends += plugin_qtsupport
 
 plugin_qmljseditor.subdir = qmljseditor
 plugin_qmljseditor.depends = plugin_texteditor

src/plugins/projectexplorer/projectexplorer.cpp

@@ -51,7 +51,6 @@
 #include "buildsettingspropertiespage.h"
 #include "currentprojectfind.h"
 #include "currentprojectfilter.h"
-#include "customexecutablerunconfiguration.h"
 #include "editorsettingspropertiespage.h"
 #include "codestylesettingspropertiespage.h"
 #include "dependenciespanel.h"
@@ -421,7 +420,6 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
     addAutoReleasedObject(currentProjectFind);
 
     addAutoReleasedObject(new LocalApplicationRunControlFactory);
-    addAutoReleasedObject(new CustomExecutableRunConfigurationFactory);
 
     addAutoReleasedObject(new ProjectFileWizardExtension);
 

src/plugins/projectexplorer/projectexplorer.pro

@@ -64,7 +64,6 @@ HEADERS += projectexplorer.h \
     runsettingspropertiespage.h \
     projecttreewidget.h \
     foldernavigationwidget.h \
-    customexecutablerunconfiguration.h \
     buildprogress.h \
     projectnodes.h \
     sessiondialog.h \
@@ -80,7 +79,6 @@ HEADERS += projectexplorer.h \
     toolchainoptionspage.h \
     cesdkhandler.h \
     gccparser.h \
-    debugginghelper.h \
     projectexplorersettingspage.h \
     projectwelcomepage.h \
     baseprojectwizarddialog.h \
@@ -97,7 +95,6 @@ HEADERS += projectexplorer.h \
     abstractprocessstep.h \
     taskhub.h \
     localapplicationruncontrol.h \
-    customexecutableconfigurationwidget.h \
     metatypedeclarations.h \
     publishing/publishingwizardselectiondialog.h \
     publishing/ipublishingwizardfactory.h \
@@ -164,7 +161,6 @@ SOURCES += projectexplorer.cpp \
     runsettingspropertiespage.cpp \
     projecttreewidget.cpp \
     foldernavigationwidget.cpp \
-    customexecutablerunconfiguration.cpp \
     buildprogress.cpp \
     projectnodes.cpp \
     sessiondialog.cpp \
@@ -180,7 +176,6 @@ SOURCES += projectexplorer.cpp \
     toolchainoptionspage.cpp \
     cesdkhandler.cpp \
     gccparser.cpp \
-    debugginghelper.cpp \
     projectexplorersettingspage.cpp \
     projectwelcomepage.cpp \
     corelistenercheckingforrunningbuild.cpp \
@@ -197,7 +192,6 @@ SOURCES += projectexplorer.cpp \
     taskhub.cpp \
     processparameters.cpp \
     localapplicationruncontrol.cpp \
-    customexecutableconfigurationwidget.cpp \
     publishing/publishingwizardselectiondialog.cpp \
     appoutputpane.cpp \
     codestylesettingspropertiespage.cpp \

src/plugins/projectexplorer/projectexplorer.qbs

@@ -69,12 +69,6 @@ QtcPlugin {
         "currentprojectfilter.cpp",
         "currentprojectfind.cpp",
         "currentprojectfind.h",
-        "customexecutableconfigurationwidget.cpp",
-        "customexecutableconfigurationwidget.h",
-        "customexecutablerunconfiguration.cpp",
-        "customexecutablerunconfiguration.h",
-        "debugginghelper.cpp",
-        "debugginghelper.h",
         "dependenciespanel.h",
         "deployconfiguration.cpp",
         "deployconfiguration.h",

src/plugins/qt4projectmanager/qt-desktop/desktopqtversionfactory.cpp

@@ -33,7 +33,6 @@
 #include "qt4projectmanagerconstants.h"
 #include "desktopqtversion.h"
 
-#include <projectexplorer/debugginghelper.h>
 #include <qtsupport/qtversionmanager.h>
 #include <qtsupport/qtsupportconstants.h>
 

src/plugins/qt4projectmanager/qt-desktop/qt4desktoptarget.cpp

@@ -36,7 +36,7 @@
 #include "qt4runconfiguration.h"
 #include "qt4buildconfiguration.h"
 #include <projectexplorer/deployconfiguration.h>
-#include <projectexplorer/customexecutablerunconfiguration.h>
+#include <qtsupport/customexecutablerunconfiguration.h>
 #include <QApplication>
 #include <QStyle>
 
@@ -95,7 +95,7 @@ void Qt4DesktopTarget::createApplicationProFiles(bool reparse)
 
     // Oh still none? Add a custom executable runconfiguration
     if (runConfigurations().isEmpty()) {
-        addRunConfiguration(new ProjectExplorer::CustomExecutableRunConfiguration(this));
+        addRunConfiguration(new QtSupport::CustomExecutableRunConfiguration(this));
     }
 }
 

src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp

@@ -39,8 +39,8 @@
 
 #include <projectexplorer/deployconfiguration.h>
 #include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/customexecutablerunconfiguration.h>
 #include <projectexplorer/projectexplorerconstants.h>
+#include <qtsupport/customexecutablerunconfiguration.h>
 
 #include <qtsupport/qtversionmanager.h>
 
@@ -192,6 +192,6 @@ ProjectExplorer::Target *Qt4DesktopTargetFactory::create(ProjectExplorer::Projec
     t->createApplicationProFiles(false);
 
     if (t->runConfigurations().isEmpty())
-        t->addRunConfiguration(new ProjectExplorer::CustomExecutableRunConfiguration(t));
+        t->addRunConfiguration(new QtSupport::CustomExecutableRunConfiguration(t));
     return t;
 }

src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h

@@ -90,8 +90,8 @@ public:
     virtual QString workingDirectory() const;
     virtual QString commandLineArguments() const;
     virtual Utils::Environment environment() const;
-    virtual QString dumperLibrary() const;
-    virtual QStringList dumperLibraryLocations() const;
+    QString dumperLibrary() const;
+    QStringList dumperLibraryLocations() const;
 
     bool isUsingDyldImageSuffix() const;
     void setUsingDyldImageSuffix(bool state);

src/plugins/qt4projectmanager/qt-desktop/qt4simulatortarget.cpp

@@ -36,8 +36,8 @@
 #include "qt4runconfiguration.h"
 #include "qt4buildconfiguration.h"
 
-#include <projectexplorer/customexecutablerunconfiguration.h>
 #include <projectexplorer/deployconfiguration.h>
+#include <qtsupport/customexecutablerunconfiguration.h>
 #include <QApplication>
 
 using namespace Qt4ProjectManager;
@@ -91,7 +91,7 @@ void Qt4SimulatorTarget::createApplicationProFiles(bool reparse)
 
     // Oh still none? Add a custom executable runconfiguration
     if (runConfigurations().isEmpty()) {
-        addRunConfiguration(new ProjectExplorer::CustomExecutableRunConfiguration(this));
+        addRunConfiguration(new QtSupport::CustomExecutableRunConfiguration(this));
     }
 }
 

src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp

@@ -40,7 +40,7 @@
 
 #include <projectexplorer/deployconfiguration.h>
 #include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/customexecutablerunconfiguration.h>
+#include <qtsupport/customexecutablerunconfiguration.h>
 
 #include <QApplication>
 #include <QStyle>
@@ -168,6 +168,6 @@ ProjectExplorer::Target *Qt4SimulatorTargetFactory::create(ProjectExplorer::Proj
     t->createApplicationProFiles(false);
 
     if (t->runConfigurations().isEmpty())
-        t->addRunConfiguration(new ProjectExplorer::CustomExecutableRunConfiguration(t));
+        t->addRunConfiguration(new QtSupport::CustomExecutableRunConfiguration(t));
     return t;
 }

src/plugins/qt4projectmanager/qt-s60/qt4symbiantarget.cpp

@@ -40,11 +40,11 @@
 #include "qt-s60/s60deployconfiguration.h"
 #include "qt-s60/s60devicerunconfiguration.h"
 
-#include <projectexplorer/customexecutablerunconfiguration.h>
 #include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/toolchainmanager.h>
 #include <projectexplorer/toolchain.h>
+#include <qtsupport/customexecutablerunconfiguration.h>
 #include <extensionsystem/pluginmanager.h>
 #include <QApplication>
 
@@ -104,7 +104,7 @@ void Qt4SymbianTarget::createApplicationProFiles(bool reparse)
 
     // Oh still none? Add a custom executable runconfiguration
     if (runConfigurations().isEmpty()) {
-        addRunConfiguration(new ProjectExplorer::CustomExecutableRunConfiguration(this));
+        addRunConfiguration(new QtSupport::CustomExecutableRunConfiguration(this));
     }
 }
 

src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp

@@ -42,8 +42,8 @@
 #include "qt-s60/qt4symbiantarget.h"
 
 #include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/customexecutablerunconfiguration.h>
 #include <projectexplorer/toolchainmanager.h>
+#include <qtsupport/customexecutablerunconfiguration.h>
 
 #include <qtsupport/qtversionmanager.h>
 
@@ -210,7 +210,7 @@ ProjectExplorer::Target *Qt4SymbianTargetFactory::create(ProjectExplorer::Projec
     t->createApplicationProFiles(false);
 
     if (t->runConfigurations().isEmpty())
-        t->addRunConfiguration(new ProjectExplorer::CustomExecutableRunConfiguration(t));
+        t->addRunConfiguration(new QtSupport::CustomExecutableRunConfiguration(t));
     return t;
 }
 

src/plugins/qt4projectmanager/qt4project.cpp

@@ -57,10 +57,10 @@
 #include <projectexplorer/headerpath.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/buildenvironmentwidget.h>
-#include <projectexplorer/customexecutablerunconfiguration.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <utils/qtcassert.h>
+#include <qtsupport/customexecutablerunconfiguration.h>
 #include <qtsupport/qmldumptool.h>
 #include <qtsupport/baseqtversion.h>
 #include <qtsupport/profilereader.h>

src/plugins/qt4projectmanager/qt4target.cpp

@@ -47,11 +47,11 @@
 #include <extensionsystem/pluginmanager.h>
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/runconfiguration.h>
-#include <projectexplorer/customexecutablerunconfiguration.h>
 #include <projectexplorer/toolchainmanager.h>
 #include <projectexplorer/toolchain.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/task.h>
+#include <qtsupport/customexecutablerunconfiguration.h>
 #include <qtsupport/qtversionfactory.h>
 #include <qtsupport/baseqtversion.h>
 #include <qtsupport/qtversionmanager.h>
@@ -347,8 +347,8 @@ void Qt4BaseTarget::removeUnconfiguredCustomExectutableRunConfigurations()
         // Remove all run configurations which the new project wizard created
         QList<ProjectExplorer::RunConfiguration*> toRemove;
         foreach (ProjectExplorer::RunConfiguration * rc, runConfigurations()) {
-            ProjectExplorer::CustomExecutableRunConfiguration *cerc
-                    = qobject_cast<ProjectExplorer::CustomExecutableRunConfiguration *>(rc);
+            QtSupport::CustomExecutableRunConfiguration *cerc
+                    = qobject_cast<QtSupport::CustomExecutableRunConfiguration *>(rc);
             if (cerc && !cerc->isConfigured())
                 toRemove.append(rc);
         }

src/plugins/qtsupport/baseqtversion.cpp

@@ -39,11 +39,11 @@
 #include "profilereader.h"
 #include <projectexplorer/toolchainmanager.h>
 #include <projectexplorer/toolchain.h>
-#include <projectexplorer/debugginghelper.h>
 #include <projectexplorer/gnumakeparser.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/toolchainmanager.h>
+#include <qtsupport/debugginghelper.h>
 #include <qtsupport/qtsupportconstants.h>
 
 #include <utils/persistentsettings.h>
@@ -795,7 +795,7 @@ void BaseQtVersion::updateVersionInfo() const
         const QString qtInstallBins = m_versionInfo.value(installBinsKey);
         const QString qtHeaderData = m_versionInfo.value(installHeadersKey);
         if (!qtInstallData.isEmpty()) {
-            m_hasDebuggingHelper = !ProjectExplorer::DebuggingHelperLibrary::debuggingHelperLibraryByInstallData(qtInstallData).isEmpty();
+            m_hasDebuggingHelper = !QtSupport::DebuggingHelperLibrary::debuggingHelperLibraryByInstallData(qtInstallData).isEmpty();
             m_hasQmlDump
                     = !QmlDumpTool::toolForQtPaths(qtInstallData, qtInstallBins, qtHeaderData, false).isEmpty()
                     || !QmlDumpTool::toolForQtPaths(qtInstallData,