diff options
17 files changed, 22 insertions, 21 deletions
diff --git a/src/plugins/analyzerbase/analyzerruncontrol.cpp b/src/plugins/analyzerbase/analyzerruncontrol.cpp index 94e75a67cc..122475828f 100644 --- a/src/plugins/analyzerbase/analyzerruncontrol.cpp +++ b/src/plugins/analyzerbase/analyzerruncontrol.cpp @@ -35,7 +35,7 @@ #include "analyzermanager.h" #include "analyzerstartparameters.h" -#include <projectexplorer/applicationrunconfiguration.h> +#include <projectexplorer/localapplicationrunconfiguration.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/task.h> diff --git a/src/plugins/analyzerbase/analyzerruncontrolfactory.cpp b/src/plugins/analyzerbase/analyzerruncontrolfactory.cpp index 4ee4793af2..6a12a5f189 100644 --- a/src/plugins/analyzerbase/analyzerruncontrolfactory.cpp +++ b/src/plugins/analyzerbase/analyzerruncontrolfactory.cpp @@ -35,7 +35,7 @@ #include "ianalyzertool.h" #include "analyzerstartparameters.h" -#include <projectexplorer/applicationrunconfiguration.h> +#include <projectexplorer/localapplicationrunconfiguration.h> #include <projectexplorer/projectexplorer.h> #include <utils/qtcassert.h> diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h index acc6eaf679..18522dd625 100644 --- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h +++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h @@ -30,7 +30,7 @@ #ifndef CMAKERUNCONFIGURATION_H #define CMAKERUNCONFIGURATION_H -#include <projectexplorer/applicationrunconfiguration.h> +#include <projectexplorer/localapplicationrunconfiguration.h> #include <utils/environment.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index a2d76a2bba..5c9493a13d 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -92,7 +92,7 @@ #include <extensionsystem/invoker.h> #include <projectexplorer/abi.h> -#include <projectexplorer/applicationrunconfiguration.h> +#include <projectexplorer/localapplicationrunconfiguration.h> #include <projectexplorer/buildconfiguration.h> #include <projectexplorer/buildmanager.h> #include <projectexplorer/devicesupport/deviceprocessesdialog.h> diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp index aa4b185948..ce1f9ccc41 100644 --- a/src/plugins/debugger/debuggerrunner.cpp +++ b/src/plugins/debugger/debuggerrunner.cpp @@ -48,7 +48,7 @@ #endif #include <projectexplorer/abi.h> -#include <projectexplorer/applicationrunconfiguration.h> // For LocalApplication* +#include <projectexplorer/localapplicationrunconfiguration.h> // For LocalApplication* #include <projectexplorer/buildconfiguration.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorer.h> diff --git a/src/plugins/projectexplorer/applicationrunconfiguration.cpp b/src/plugins/projectexplorer/localapplicationrunconfiguration.cpp index d67358ce66..ee4f1cf9bb 100644 --- a/src/plugins/projectexplorer/applicationrunconfiguration.cpp +++ b/src/plugins/projectexplorer/localapplicationrunconfiguration.cpp @@ -27,7 +27,8 @@ ** ****************************************************************************/ -#include "applicationrunconfiguration.h" +#include "localapplicationrunconfiguration.h" + #include "buildconfiguration.h" #include <coreplugin/variablemanager.h> diff --git a/src/plugins/projectexplorer/applicationrunconfiguration.h b/src/plugins/projectexplorer/localapplicationrunconfiguration.h index b9f721ce2c..ceba4d6bb4 100644 --- a/src/plugins/projectexplorer/applicationrunconfiguration.h +++ b/src/plugins/projectexplorer/localapplicationrunconfiguration.h @@ -27,8 +27,8 @@ ** ****************************************************************************/ -#ifndef APPLICATIONRUNCONFIGURATION_H -#define APPLICATIONRUNCONFIGURATION_H +#ifndef LOCALAPPLICATIONRUNCONFIGURATION_H +#define LOCALAPPLICATIONRUNCONFIGURATION_H #include "runconfiguration.h" #include "applicationlauncher.h" @@ -67,4 +67,4 @@ protected: } // namespace ProjectExplorer -#endif // APPLICATIONRUNCONFIGURATION_H +#endif // LOCALAPPLICATIONRUNCONFIGURATION_H diff --git a/src/plugins/projectexplorer/localapplicationruncontrol.cpp b/src/plugins/projectexplorer/localapplicationruncontrol.cpp index 11fc2a3de6..bff03f30ea 100644 --- a/src/plugins/projectexplorer/localapplicationruncontrol.cpp +++ b/src/plugins/projectexplorer/localapplicationruncontrol.cpp @@ -28,7 +28,7 @@ ****************************************************************************/ #include "localapplicationruncontrol.h" -#include "applicationrunconfiguration.h" +#include "localapplicationrunconfiguration.h" #include "projectexplorerconstants.h" #include <utils/outputformat.h> diff --git a/src/plugins/projectexplorer/projectexplorer.pro b/src/plugins/projectexplorer/projectexplorer.pro index e74a1b3888..ed9c7cd0aa 100644 --- a/src/plugins/projectexplorer/projectexplorer.pro +++ b/src/plugins/projectexplorer/projectexplorer.pro @@ -13,6 +13,7 @@ HEADERS += projectexplorer.h \ abiwidget.h \ clangparser.h \ gcctoolchain.h \ + localapplicationrunconfiguration.h \ projectexplorer_export.h \ projectwindow.h \ removetaskhandler.h \ @@ -66,7 +67,6 @@ HEADERS += projectexplorer.h \ editorsettingspropertiespage.h \ runconfiguration.h \ applicationlauncher.h \ - applicationrunconfiguration.h \ runsettingspropertiespage.h \ projecttreewidget.h \ foldernavigationwidget.h \ @@ -136,6 +136,7 @@ SOURCES += projectexplorer.cpp \ abiwidget.cpp \ clangparser.cpp \ gcctoolchain.cpp \ + localapplicationrunconfiguration.cpp \ projectwindow.cpp \ removetaskhandler.cpp \ kit.cpp \ @@ -182,7 +183,6 @@ SOURCES += projectexplorer.cpp \ editorsettingspropertiespage.cpp \ runconfiguration.cpp \ applicationlauncher.cpp \ - applicationrunconfiguration.cpp \ runsettingspropertiespage.cpp \ projecttreewidget.cpp \ foldernavigationwidget.cpp \ diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs index 5a3a51b805..8b0b5333c1 100644 --- a/src/plugins/projectexplorer/projectexplorer.qbs +++ b/src/plugins/projectexplorer/projectexplorer.qbs @@ -33,8 +33,6 @@ QtcPlugin { "allprojectsfind.h", "applicationlauncher.cpp", "applicationlauncher.h", - "applicationrunconfiguration.cpp", - "applicationrunconfiguration.h", "appoutputpane.cpp", "appoutputpane.h", "baseprojectwizarddialog.cpp", @@ -134,6 +132,8 @@ QtcPlugin { "ldparser.h", "linuxiccparser.cpp", "linuxiccparser.h", + "localapplicationrunconfiguration.cpp", + "localapplicationrunconfiguration.h", "localapplicationruncontrol.cpp", "localapplicationruncontrol.h", "metatypedeclarations.h", diff --git a/src/plugins/qmlprofiler/qmlprofilerengine.cpp b/src/plugins/qmlprofiler/qmlprofilerengine.cpp index 550c9cc114..893de647c6 100644 --- a/src/plugins/qmlprofiler/qmlprofilerengine.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerengine.cpp @@ -39,7 +39,7 @@ #include <qmlprojectmanager/qmlprojectrunconfiguration.h> #include <qmlprojectmanager/qmlprojectplugin.h> #include <projectexplorer/localapplicationruncontrol.h> -#include <projectexplorer/applicationrunconfiguration.h> +#include <projectexplorer/localapplicationrunconfiguration.h> #include <qmldebug/qmloutputparser.h> #include <remotelinux/remotelinuxrunconfiguration.h> diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp index 5dd82bd9cb..fce63e8f93 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp @@ -52,7 +52,7 @@ #include <projectexplorer/project.h> #include <projectexplorer/target.h> #include <projectexplorer/session.h> -#include <projectexplorer/applicationrunconfiguration.h> +#include <projectexplorer/localapplicationrunconfiguration.h> #include <remotelinux/remotelinuxrunconfiguration.h> #include <remotelinux/linuxdevice.h> diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h index edca7d613e..4470b2438d 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h +++ b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h @@ -32,7 +32,7 @@ #include "qmakerunconfigurationfactory.h" -#include <projectexplorer/applicationrunconfiguration.h> +#include <projectexplorer/localapplicationrunconfiguration.h> #include <utils/environment.h> diff --git a/src/plugins/qtsupport/customexecutablerunconfiguration.h b/src/plugins/qtsupport/customexecutablerunconfiguration.h index 5a0ec692f4..533212eded 100644 --- a/src/plugins/qtsupport/customexecutablerunconfiguration.h +++ b/src/plugins/qtsupport/customexecutablerunconfiguration.h @@ -32,7 +32,7 @@ #include "qtsupport_global.h" -#include <projectexplorer/applicationrunconfiguration.h> +#include <projectexplorer/localapplicationrunconfiguration.h> #include <utils/environment.h> diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp index 383664c5d6..b4a481e22d 100644 --- a/src/plugins/valgrind/valgrindengine.cpp +++ b/src/plugins/valgrind/valgrindengine.cpp @@ -36,7 +36,7 @@ #include <coreplugin/progressmanager/progressmanager.h> #include <coreplugin/progressmanager/futureprogress.h> #include <extensionsystem/pluginmanager.h> -#include <projectexplorer/applicationrunconfiguration.h> +#include <projectexplorer/localapplicationrunconfiguration.h> #include <analyzerbase/analyzermanager.h> #include <QApplication> diff --git a/src/plugins/valgrind/valgrindplugin.cpp b/src/plugins/valgrind/valgrindplugin.cpp index 32f4b90be3..c44db4b55b 100644 --- a/src/plugins/valgrind/valgrindplugin.cpp +++ b/src/plugins/valgrind/valgrindplugin.cpp @@ -40,7 +40,7 @@ #include <analyzerbase/analyzerstartparameters.h> #include <analyzerbase/startremotedialog.h> -#include <projectexplorer/applicationrunconfiguration.h> +#include <projectexplorer/localapplicationrunconfiguration.h> #include <projectexplorer/projectexplorer.h> #include <utils/hostosinfo.h> diff --git a/src/plugins/valgrind/valgrindtool.cpp b/src/plugins/valgrind/valgrindtool.cpp index ee94db2538..add6b9a9ca 100644 --- a/src/plugins/valgrind/valgrindtool.cpp +++ b/src/plugins/valgrind/valgrindtool.cpp @@ -31,7 +31,7 @@ #include <remotelinux/remotelinuxrunconfiguration.h> -#include <projectexplorer/applicationrunconfiguration.h> +#include <projectexplorer/localapplicationrunconfiguration.h> #include <projectexplorer/kitinformation.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/target.h> |