diff options
| author | Tobias Hunger <[email protected]> | 2012-05-16 16:24:16 +0200 |
|---|---|---|
| committer | Tobias Hunger <[email protected]> | 2012-05-18 15:48:26 +0200 |
| commit | 5a79945ef6a7e43b01e1d60ff4db614439e1091a (patch) | |
| tree | 549977c4b228dc40bde021ef679d0f814a15238c /src/plugins/autotoolsprojectmanager | |
| parent | 5c23c44ed099500850f45ae0250a519ba4a18493 (diff) | |
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 <[email protected]>
Diffstat (limited to 'src/plugins/autotoolsprojectmanager')
4 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in b/src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in index 39a1ce145ae..15467b7f042 100644 --- a/src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in +++ b/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> diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp index 44172b7109a..d4a4fb2adb7 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp +++ b/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; } diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager_dependencies.pri b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager_dependencies.pri index 614357cd4d5..774680fda47 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager_dependencies.pri +++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager_dependencies.pri @@ -1,3 +1,4 @@ include(../../plugins/projectexplorer/projectexplorer.pri) include(../../plugins/coreplugin/coreplugin.pri) include(../../plugins/cpptools/cpptools.pri) +include(../../plugins/qtsupport/qtsupport.pri) diff --git a/src/plugins/autotoolsprojectmanager/autotoolstarget.cpp b/src/plugins/autotoolsprojectmanager/autotoolstarget.cpp index c061fe9ac74..c7917e50b1c 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolstarget.cpp +++ b/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; } |