feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

DebuggingHelper: Move to QtSupport

Browse Source 
* 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>
This commit is contained in:
Tobias Hunger
2012-05-16 16:24:16 +02:00
parent 5c23c44ed0
commit 5a79945ef6
47 changed files with 159 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/android/androidtarget.cpp
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+1
View File
@@ -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
+2 -2
View File
@@ -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
+1
View File
@@ -1,3 +1,4 @@
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
+2 -2
View File
@@ -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
+1
View File
@@ -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
+1
View File
@@ -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
+1
View File
@@ -1,3 +1,4 @@
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
+7 -7
View File
@@ -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
+4 -5
View File
@@ -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
-1
View File
@@ -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
+1
View File
@@ -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
+2 -2
View File
@@ -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
+1
View File
@@ -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
+1
View File
@@ -1,3 +1,4 @@
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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+3
View File
@@ -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
-2
View File
@@ -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
-6
View File
@@ -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
-6
View File
@@ -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
-1
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
+3 -3
View File
@@ -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
+4 -4
View File
@@ -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, qtInstallBins, qtHeaderData, true).isEmpty();
@@ -964,7 +964,7 @@ QString BaseQtVersion::gdbDebuggingHelperLibrary() const
QString qtInstallData = versionInfo().value(QLatin1String("QT_INSTALL_DATA"));
if (qtInstallData.isEmpty())
return QString();
return ProjectExplorer::DebuggingHelperLibrary::debuggingHelperLibraryByInstallData(qtInstallData);
return QtSupport::DebuggingHelperLibrary::debuggingHelperLibraryByInstallData(qtInstallData);
}
QString BaseQtVersion::qmlDumpTool(bool debugVersion) const
@@ -998,7 +998,7 @@ QStringList BaseQtVersion::debuggingHelperLibraryLocations() const
QString qtInstallData = versionInfo().value(QLatin1String("QT_INSTALL_DATA"));
if (qtInstallData.isEmpty())
return QStringList();
return ProjectExplorer::DebuggingHelperLibrary::debuggingHelperLibraryDirectories(qtInstallData);
return QtSupport::DebuggingHelperLibrary::debuggingHelperLibraryDirectories(qtInstallData);
}
bool BaseQtVersion::supportsBinaryDebuggingHelper() const
src/plugins/projectexplorer/customexecutableconfigurationwidget.cpp → src/plugins/qtsupport/customexecutableconfigurationwidget.cpp
+10 -9
View File
@@ -32,10 +32,10 @@
#include "customexecutableconfigurationwidget.h"
#include "customexecutablerunconfiguration.h"
#include "target.h"
#include "project.h"
#include "environmentwidget.h"
#include <projectexplorer/target.h>
#include <projectexplorer/project.h>
#include <projectexplorer/environmentwidget.h>
#include <coreplugin/helpmanager.h>
#include <utils/detailswidget.h>
#include <utils/environment.h>
@@ -49,7 +49,7 @@
#include <QLineEdit>
namespace ProjectExplorer {
namespace QtSupport {
namespace Internal {
CustomExecutableConfigurationWidget::CustomExecutableConfigurationWidget(CustomExecutableRunConfiguration *rc)
@@ -112,7 +112,7 @@ CustomExecutableConfigurationWidget::CustomExecutableConfigurationWidget(CustomE
baseEnvironmentLayout->addWidget(m_baseEnvironmentComboBox);
baseEnvironmentLayout->addStretch(10);
m_environmentWidget = new EnvironmentWidget(this, baseEnvironmentWidget);
m_environmentWidget = new ProjectExplorer::EnvironmentWidget(this, baseEnvironmentWidget);
m_environmentWidget->setBaseEnvironment(rc->baseEnvironment());
m_environmentWidget->setBaseEnvironmentText(rc->baseEnvironmentText());
m_environmentWidget->setUserChanges(rc->userEnvironmentChanges());
@@ -195,8 +195,8 @@ void CustomExecutableConfigurationWidget::workingDirectoryEdited()
void CustomExecutableConfigurationWidget::termToggled(bool on)
{
m_ignoreChange = true;
m_runConfiguration->setRunMode(on ? LocalApplicationRunConfiguration::Console
: LocalApplicationRunConfiguration::Gui);
m_runConfiguration->setRunMode(on ? ProjectExplorer::LocalApplicationRunConfiguration::Console
: ProjectExplorer::LocalApplicationRunConfiguration::Gui);
m_ignoreChange = false;
}
@@ -209,8 +209,9 @@ void CustomExecutableConfigurationWidget::changed()
m_executableChooser->setPath(m_runConfiguration->rawExecutable());
m_commandLineArgumentsLineEdit->setText(m_runConfiguration->rawCommandLineArguments());
m_workingDirectory->setPath(m_runConfiguration->baseWorkingDirectory());
m_useTerminalCheck->setChecked(m_runConfiguration->runMode() == LocalApplicationRunConfiguration::Console);
m_useTerminalCheck->setChecked(m_runConfiguration->runMode()
== ProjectExplorer::LocalApplicationRunConfiguration::Console);
}
} // namespace Internal
} // namespace ProjectExplorer
} // namespace QtSupport
src/plugins/projectexplorer/customexecutableconfigurationwidget.h → src/plugins/qtsupport/customexecutableconfigurationwidget.h
+3 -3
View File
@@ -48,9 +48,9 @@ class DetailsWidget;
class PathChooser;
}
namespace ProjectExplorer {
namespace ProjectExplorer { class EnvironmentWidget; }
namespace QtSupport {
class CustomExecutableRunConfiguration;
class EnvironmentWidget;
namespace Internal {
@@ -88,6 +88,6 @@ private:
};
} // namespace Internal
} // namespace ProjectExplorer
} // namespace QtSupport
#endif // CUSTOMEXECUTABLECONFIGURATIONWIDGET_H
src/plugins/projectexplorer/customexecutablerunconfiguration.cpp → src/plugins/qtsupport/customexecutablerunconfiguration.cpp
+37 -30
View File
@@ -32,12 +32,12 @@
#include "customexecutablerunconfiguration.h"
#include "customexecutableconfigurationwidget.h"
#include "buildconfiguration.h"
#include "debugginghelper.h"
#include "projectexplorerconstants.h"
#include "target.h"
#include "abi.h"
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/target.h>
#include <projectexplorer/abi.h>
#include <coreplugin/icore.h>
@@ -52,8 +52,8 @@
#include <QDir>
using namespace ProjectExplorer;
using namespace ProjectExplorer::Internal;
using namespace QtSupport;
using namespace QtSupport::Internal;
namespace {
const char * const CUSTOM_EXECUTABLE_ID("ProjectExplorer.CustomExecutableRunConfiguration");
@@ -81,8 +81,8 @@ void CustomExecutableRunConfiguration::ctor()
}
}
CustomExecutableRunConfiguration::CustomExecutableRunConfiguration(Target *parent) :
LocalApplicationRunConfiguration(parent, Core::Id(CUSTOM_EXECUTABLE_ID)),
CustomExecutableRunConfiguration::CustomExecutableRunConfiguration(ProjectExplorer::Target *parent) :
ProjectExplorer::LocalApplicationRunConfiguration(parent, Core::Id(CUSTOM_EXECUTABLE_ID)),
m_workingDirectory(QLatin1String(ProjectExplorer::Constants::DEFAULT_WORKING_DIR)),
m_runMode(Gui),
m_baseEnvironmentBase(CustomExecutableRunConfiguration::BuildEnvironmentBase)
@@ -90,8 +90,9 @@ CustomExecutableRunConfiguration::CustomExecutableRunConfiguration(Target *paren
ctor();
}
CustomExecutableRunConfiguration::CustomExecutableRunConfiguration(Target *parent, CustomExecutableRunConfiguration *source) :
LocalApplicationRunConfiguration(parent, source),
CustomExecutableRunConfiguration::CustomExecutableRunConfiguration(ProjectExplorer::Target *parent,
CustomExecutableRunConfiguration *source) :
ProjectExplorer::LocalApplicationRunConfiguration(parent, source),
m_executable(source->m_executable),
m_workingDirectory(source->m_workingDirectory),
m_cmdArguments(source->m_cmdArguments),
@@ -177,7 +178,7 @@ bool CustomExecutableRunConfiguration::isConfigured() const
return !m_executable.isEmpty();
}
LocalApplicationRunConfiguration::RunMode CustomExecutableRunConfiguration::runMode() const
ProjectExplorer::LocalApplicationRunConfiguration::RunMode CustomExecutableRunConfiguration::runMode() const
{
return m_runMode;
}
@@ -317,7 +318,7 @@ void CustomExecutableRunConfiguration::setBaseWorkingDirectory(const QString &wo
emit changed();
}
void CustomExecutableRunConfiguration::setRunMode(RunMode runMode)
void CustomExecutableRunConfiguration::setRunMode(ProjectExplorer::LocalApplicationRunConfiguration::RunMode runMode)
{
m_runMode = runMode;
emit changed();
@@ -330,21 +331,21 @@ QWidget *CustomExecutableRunConfiguration::createConfigurationWidget()
QString CustomExecutableRunConfiguration::dumperLibrary() const
{
Utils::FileName qmakePath = ProjectExplorer::DebuggingHelperLibrary::findSystemQt(environment());
QString qtInstallData = ProjectExplorer::DebuggingHelperLibrary::qtInstallDataDir(qmakePath);
return ProjectExplorer::DebuggingHelperLibrary::debuggingHelperLibraryByInstallData(qtInstallData);
Utils::FileName qmakePath = DebuggingHelperLibrary::findSystemQt(environment());
QString qtInstallData = DebuggingHelperLibrary::qtInstallDataDir(qmakePath);
return DebuggingHelperLibrary::debuggingHelperLibraryByInstallData(qtInstallData);
}
QStringList CustomExecutableRunConfiguration::dumperLibraryLocations() const
{
Utils::FileName qmakePath = ProjectExplorer::DebuggingHelperLibrary::findSystemQt(environment());
QString qtInstallData = ProjectExplorer::DebuggingHelperLibrary::qtInstallDataDir(qmakePath);
return ProjectExplorer::DebuggingHelperLibrary::debuggingHelperLibraryDirectories(qtInstallData);
Utils::FileName qmakePath = DebuggingHelperLibrary::findSystemQt(environment());
QString qtInstallData = DebuggingHelperLibrary::qtInstallDataDir(qmakePath);
return DebuggingHelperLibrary::debuggingHelperLibraryDirectories(qtInstallData);
}
ProjectExplorer::Abi CustomExecutableRunConfiguration::abi() const
{
return Abi(); // return an invalid ABI: We do not know what we will end up running!
return ProjectExplorer::Abi(); // return an invalid ABI: We do not know what we will end up running!
}
// Factory
@@ -359,28 +360,31 @@ CustomExecutableRunConfigurationFactory::~CustomExecutableRunConfigurationFactor
}
bool CustomExecutableRunConfigurationFactory::canCreate(Target *parent, const Core::Id id) const
bool CustomExecutableRunConfigurationFactory::canCreate(ProjectExplorer::Target *parent,
const Core::Id id) const
{
Q_UNUSED(parent);
return id == Core::Id(CUSTOM_EXECUTABLE_ID);
}
RunConfiguration *CustomExecutableRunConfigurationFactory::create(Target *parent, const Core::Id id)
ProjectExplorer::RunConfiguration *
CustomExecutableRunConfigurationFactory::create(ProjectExplorer::Target *parent, const Core::Id id)
{
if (!canCreate(parent, id))
return 0;
RunConfiguration *rc(new CustomExecutableRunConfiguration(parent));
return rc;
return new CustomExecutableRunConfiguration(parent);
}
bool CustomExecutableRunConfigurationFactory::canRestore(Target *parent, const QVariantMap &map) const
bool CustomExecutableRunConfigurationFactory::canRestore(ProjectExplorer::Target *parent,
const QVariantMap &map) const
{
Core::Id id(idFromMap(map));
Core::Id id(ProjectExplorer::idFromMap(map));
return canCreate(parent, id);
}
RunConfiguration *CustomExecutableRunConfigurationFactory::restore(Target *parent, const QVariantMap &map)
ProjectExplorer::RunConfiguration *
CustomExecutableRunConfigurationFactory::restore(ProjectExplorer::Target *parent, const QVariantMap &map)
{
if (!canRestore(parent, map))
return 0;
@@ -391,19 +395,22 @@ RunConfiguration *CustomExecutableRunConfigurationFactory::restore(Target *paren
return 0;
}
bool CustomExecutableRunConfigurationFactory::canClone(Target *parent, RunConfiguration *source) const
bool CustomExecutableRunConfigurationFactory::canClone(ProjectExplorer::Target *parent,
ProjectExplorer::RunConfiguration *source) const
{
return canCreate(parent, source->id());
}
RunConfiguration *CustomExecutableRunConfigurationFactory::clone(Target *parent, RunConfiguration *source)
ProjectExplorer::RunConfiguration *
CustomExecutableRunConfigurationFactory::clone(ProjectExplorer::Target *parent,
ProjectExplorer::RunConfiguration *source)
{
if (!canClone(parent, source))
return 0;
return new CustomExecutableRunConfiguration(parent, static_cast<CustomExecutableRunConfiguration*>(source));
}
QList<Core::Id> CustomExecutableRunConfigurationFactory::availableCreationIds(Target *parent) const
QList<Core::Id> CustomExecutableRunConfigurationFactory::availableCreationIds(ProjectExplorer::Target *parent) const
{
Q_UNUSED(parent)
return QList<Core::Id>() << Core::Id(CUSTOM_EXECUTABLE_ID);
src/plugins/projectexplorer/customexecutablerunconfiguration.h → src/plugins/qtsupport/customexecutablerunconfiguration.h
+22 -20
View File
@@ -33,22 +33,22 @@
#ifndef CUSTOMEXECUTABLERUNCONFIGURATION_H
#define CUSTOMEXECUTABLERUNCONFIGURATION_H
#include "applicationrunconfiguration.h"
#include "qtsupport_global.h"
#include <projectexplorer/applicationrunconfiguration.h>
#include <utils/environment.h>
#include <QVariantMap>
namespace ProjectExplorer {
class Target;
namespace ProjectExplorer { class Target; }
namespace Internal {
class CustomExecutableConfigurationWidget;
}
namespace QtSupport {
namespace Internal { class CustomExecutableConfigurationWidget; }
class CustomExecutableRunConfigurationFactory;
class PROJECTEXPLORER_EXPORT CustomExecutableRunConfiguration : public LocalApplicationRunConfiguration
class QTSUPPORT_EXPORT CustomExecutableRunConfiguration : public ProjectExplorer::LocalApplicationRunConfiguration
{
Q_OBJECT
// the configuration widget needs to setExecutable setWorkingDirectory and setCommandLineArguments
@@ -56,7 +56,7 @@ class PROJECTEXPLORER_EXPORT CustomExecutableRunConfiguration : public LocalAppl
friend class CustomExecutableRunConfigurationFactory;
public:
explicit CustomExecutableRunConfiguration(Target *parent);
explicit CustomExecutableRunConfiguration(ProjectExplorer::Target *parent);
~CustomExecutableRunConfiguration();
/**
@@ -69,7 +69,7 @@ public:
*/
bool isConfigured() const;
LocalApplicationRunConfiguration::RunMode runMode() const;
RunMode runMode() const;
QString workingDirectory() const;
QString commandLineArguments() const;
Utils::Environment environment() const;
@@ -92,7 +92,8 @@ private slots:
void activeBuildConfigurationChanged();
protected:
CustomExecutableRunConfiguration(Target *parent, CustomExecutableRunConfiguration *source);
CustomExecutableRunConfiguration(ProjectExplorer::Target *parent,
CustomExecutableRunConfiguration *source);
virtual bool fromMap(const QVariantMap &map);
QString defaultDisplayName() const;
@@ -116,7 +117,7 @@ private:
void setBaseWorkingDirectory(const QString &workingDirectory);
QString baseWorkingDirectory() const;
void setUserName(const QString &name);
void setRunMode(RunMode runMode);
void setRunMode(ProjectExplorer::LocalApplicationRunConfiguration::RunMode runMode);
QString m_executable;
QString m_workingDirectory;
@@ -129,7 +130,7 @@ private:
ProjectExplorer::BuildConfiguration *m_lastActiveBuildConfiguration;
};
class CustomExecutableRunConfigurationFactory : public IRunConfigurationFactory
class CustomExecutableRunConfigurationFactory : public ProjectExplorer::IRunConfigurationFactory
{
Q_OBJECT
@@ -137,17 +138,18 @@ public:
explicit CustomExecutableRunConfigurationFactory(QObject *parent = 0);
~CustomExecutableRunConfigurationFactory();
QList<Core::Id> availableCreationIds(Target *parent) const;
QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const;
QString displayNameForId(const Core::Id id) const;
bool canCreate(Target *parent, const Core::Id id) const;
RunConfiguration *create(Target *parent, const Core::Id id);
bool canRestore(Target *parent, const QVariantMap &map) const;
RunConfiguration *restore(Target *parent, const QVariantMap &map);
bool canClone(Target *parent, RunConfiguration *product) const;
RunConfiguration *clone(Target *parent, RunConfiguration *source);
bool canCreate(ProjectExplorer::Target *parent, const Core::Id id) const;
ProjectExplorer::RunConfiguration *create(ProjectExplorer::Target *parent, const Core::Id id);
bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const;
ProjectExplorer::RunConfiguration *restore(ProjectExplorer::Target *parent, const QVariantMap &map);
bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *product) const;
ProjectExplorer::RunConfiguration *clone(ProjectExplorer::Target *parent,
ProjectExplorer::RunConfiguration *source);
};
} // namespace ProjectExplorer
} // namespace QtSupport
#endif // CUSTOMEXECUTABLERUNCONFIGURATION_H
src/plugins/projectexplorer/debugginghelper.cpp → src/plugins/qtsupport/debugginghelper.cpp
+1 -1
View File
@@ -46,7 +46,7 @@
#include <QDesktopServices>
using namespace ProjectExplorer;
using namespace QtSupport;
static inline QStringList validBinaryFilenames()
{
src/plugins/projectexplorer/debugginghelper.h → src/plugins/qtsupport/debugginghelper.h
+4 -4
View File
@@ -33,7 +33,7 @@
#ifndef DEBUGGINGHELPER_H
#define DEBUGGINGHELPER_H
#include "projectexplorer_export.h"
#include "qtsupport_global.h"
#include <utils/buildablehelperlibrary.h>
@@ -41,9 +41,9 @@
QT_FORWARD_DECLARE_CLASS(QStringList)
namespace ProjectExplorer {
namespace QtSupport {
class PROJECTEXPLORER_EXPORT DebuggingHelperLibrary : public Utils::BuildableHelperLibrary
class QTSUPPORT_EXPORT DebuggingHelperLibrary : public Utils::BuildableHelperLibrary
{
public:
static QString debuggingHelperLibraryByInstallData(const QString &qtInstallData);
@@ -56,6 +56,6 @@ public:
static QString copy(const QString &qtInstallData, QString *errorMessage);
};
} // namespace ProjectExplorer
} // namespace QtSupport
#endif // DEBUGGINGHELPER_H
src/plugins/qtsupport/debugginghelperbuildtask.cpp
+1 -1
View File
@@ -31,6 +31,7 @@
**************************************************************************/
#include "debugginghelperbuildtask.h"
#include "debugginghelper.h"
#include "qmldumptool.h"
#include "qmlobservertool.h"
#include "qmldebugginglibrary.h"
@@ -40,7 +41,6 @@
#include <projectexplorer/abi.h>
#include <projectexplorer/toolchainmanager.h>
#include <projectexplorer/toolchain.h>
#include <projectexplorer/debugginghelper.h>
#include <projectexplorer/abi.h>
#include <utils/qtcassert.h>
src/plugins/qtsupport/qtsupport.pro
+6
View File
@@ -26,6 +26,9 @@ HEADERS += \
qmlobservertool.h \
qmldebugginglibrary.h \
qtoptionspage.h \
customexecutablerunconfiguration.h \
customexecutableconfigurationwidget.h \
debugginghelper.h \
debugginghelperbuildtask.h \
qtsupportconstants.h \
profilereader.h \
@@ -44,6 +47,9 @@ SOURCES += \
qmlobservertool.cpp \
qmldebugginglibrary.cpp \
qtoptionspage.cpp \
customexecutablerunconfiguration.cpp \
customexecutableconfigurationwidget.cpp \
debugginghelper.cpp \
debugginghelperbuildtask.cpp \
profilereader.cpp \
qtparser.cpp \
src/plugins/qtsupport/qtsupport.qbs
+6
View File
@@ -47,6 +47,8 @@ QtcPlugin {
"qtversioninfo.ui",
"qtversionmanager.ui",
"baseqtversion.h",
"debugginghelper.cpp",
"debugginghelper.h",
"debugginghelper.ui",
"debugginghelperbuildtask.h",
"exampleslistmodel.h",
@@ -70,6 +72,10 @@ QtcPlugin {
"screenshotcropper.h",
"showbuildlog.ui",
"baseqtversion.cpp",
"customexecutableconfigurationwidget.cpp",
"customexecutableconfigurationwidget.h",
"customexecutablerunconfiguration.cpp",
"customexecutablerunconfiguration.h",
"debugginghelperbuildtask.cpp",
"exampleslistmodel.cpp",
"gettingstartedwelcomepage.cpp",
src/plugins/qtsupport/qtsupportplugin.cpp
+3
View File
@@ -32,6 +32,7 @@
#include "qtsupportplugin.h"
#include "customexecutablerunconfiguration.h"
#include "qtoptionspage.h"
#include "qtversionmanager.h"
@@ -74,6 +75,8 @@ bool QtSupportPlugin::initialize(const QStringList &arguments, QString *errorMes
GettingStartedWelcomePage *gettingStartedWelcomePage = new GettingStartedWelcomePage;
addAutoReleasedObject(gettingStartedWelcomePage);
addAutoReleasedObject(new CustomExecutableRunConfigurationFactory);
return true;
}
src/plugins/qtsupport/qtversionmanager.cpp
+2 -4
View File
@@ -36,12 +36,12 @@
#include "qtsupportconstants.h"
#include <projectexplorer/debugginghelper.h>
// only for legay restore
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/toolchainmanager.h>
#include <projectexplorer/gcctoolchain.h>
#include <qtsupport/debugginghelper.h>
#include <coreplugin/icore.h>
#include <coreplugin/helpmanager.h>
@@ -69,8 +69,6 @@
using namespace QtSupport;
using namespace QtSupport::Internal;
using ProjectExplorer::DebuggingHelperLibrary;
static const char QTVERSION_DATA_KEY[] = "QtVersion.";
static const char QTVERSION_TYPE_KEY[] = "QtVersion.Type";
static const char QTVERSION_COUNT_KEY[] = "QtVersion.Count";
@@ -413,7 +411,7 @@ void QtVersionManager::saveQtVersions()
void QtVersionManager::findSystemQt()
{
Utils::FileName systemQMakePath = ProjectExplorer::DebuggingHelperLibrary::findSystemQt(Utils::Environment::systemEnvironment());
Utils::FileName systemQMakePath = QtSupport::DebuggingHelperLibrary::findSystemQt(Utils::Environment::systemEnvironment());
if (systemQMakePath.isNull())
return;
src/plugins/remotelinux/embeddedlinuxtargetfactory.cpp
+2 -3
View File
@@ -37,12 +37,11 @@
#include "genericembeddedlinuxtarget.h"
#include "remotelinux_constants.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 <QIcon>
@@ -169,7 +168,7 @@ ProjectExplorer::Target *EmbeddedLinuxTargetFactory::create(ProjectExplorer::Pro
t->createApplicationProFiles(false);
if (t->runConfigurations().isEmpty())
t->addRunConfiguration(new ProjectExplorer::CustomExecutableRunConfiguration(t));
t->addRunConfiguration(new QtSupport::CustomExecutableRunConfiguration(t));
return t;
}
src/plugins/remotelinux/genericembeddedlinuxtarget.cpp
+2 -2
View File
@@ -35,12 +35,12 @@
#include "remotelinux_constants.h"
#include "remotelinuxrunconfiguration.h"
#include <projectexplorer/customexecutablerunconfiguration.h>
#include <projectexplorer/devicesupport/idevice.h>
#include <qt4projectmanager/qt4buildconfiguration.h>
#include <qt4projectmanager/qt4nodes.h>
#include <qt4projectmanager/qt4project.h>
#include <qtsupport/baseqtversion.h>
#include <qtsupport/customexecutablerunconfiguration.h>
#include <QCoreApplication>
@@ -102,7 +102,7 @@ void GenericEmbeddedLinuxTarget::createApplicationProFiles(bool reparse)
// Oh still none? Add a custom executable runconfiguration
if (runConfigurations().isEmpty())
addRunConfiguration(new ProjectExplorer::CustomExecutableRunConfiguration(this));
addRunConfiguration(new QtSupport::CustomExecutableRunConfiguration(this));
}
} // namespace Internal