diff options
Diffstat (limited to 'src/plugins/qt4projectmanager')
10 files changed, 18 insertions, 19 deletions
diff --git a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversionfactory.cpp b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversionfactory.cpp index e012c7f12bd..2f4d547edfc 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversionfactory.cpp +++ b/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> diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptarget.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptarget.cpp index 55137a42431..d784efcea65 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptarget.cpp +++ b/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)); } } diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp index a4e095e4088..47ab921d695 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp +++ b/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; } diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h index 3db37bba26f..8152690879f 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h +++ b/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); diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortarget.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortarget.cpp index 0c695af87cb..049f3d0501e 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortarget.cpp +++ b/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)); } } diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp index 3daacc4e570..cf20eb813c9 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp +++ b/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; } diff --git a/src/plugins/qt4projectmanager/qt-s60/qt4symbiantarget.cpp b/src/plugins/qt4projectmanager/qt-s60/qt4symbiantarget.cpp index dc548a20af8..00d3fad54a8 100644 --- a/src/plugins/qt4projectmanager/qt-s60/qt4symbiantarget.cpp +++ b/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)); } } diff --git a/src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp b/src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp index 9415b13ca2b..9f90794900d 100644 --- a/src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp +++ b/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; } diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp index e8be9ce3a7d..03ce7eec051 100644 --- a/src/plugins/qt4projectmanager/qt4project.cpp +++ b/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> diff --git a/src/plugins/qt4projectmanager/qt4target.cpp b/src/plugins/qt4projectmanager/qt4target.cpp index adfe39b697b..503fdabac85 100644 --- a/src/plugins/qt4projectmanager/qt4target.cpp +++ b/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); } |