diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp index 0772632c9a4255e5164e2d7a83e33dae15ed9ed6..40f05c9f74630c38df947c38f24e90c2bda65765 100644 --- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp @@ -35,7 +35,7 @@ #include <coreplugin/coreconstants.h> #include <coreplugin/helpmanager.h> -#include <qtsupport/debugginghelper.h> +#include <qtsupport/qtkitinformation.h> #include <projectexplorer/environmentwidget.h> #include <projectexplorer/target.h> @@ -217,17 +217,12 @@ void CMakeRunConfiguration::setCommandLineArguments(const QString &newText) QString CMakeRunConfiguration::dumperLibrary() const { - Utils::FileName qmakePath = QtSupport::DebuggingHelperLibrary::findSystemQt(environment()); - QString qtInstallData = QtSupport::DebuggingHelperLibrary::qtInstallDataDir(qmakePath); - QString dhl = QtSupport::DebuggingHelperLibrary::debuggingHelperLibraryByInstallData(qtInstallData); - return dhl; + return QtSupport::QtKitInformation::dumperLibrary(target()->kit()); } QStringList CMakeRunConfiguration::dumperLibraryLocations() const { - Utils::FileName qmakePath = QtSupport::DebuggingHelperLibrary::findSystemQt(environment()); - QString qtInstallData = QtSupport::DebuggingHelperLibrary::qtInstallDataDir(qmakePath); - return QtSupport::DebuggingHelperLibrary::debuggingHelperLibraryDirectories(qtInstallData); + return QtSupport::QtKitInformation::dumperLibraryLocations(target()->kit()); } Utils::Environment CMakeRunConfiguration::baseEnvironment() const diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp index 55ab79ee37470714fdc01724b1e5392b173f8ee6..c69f1546034fe1da8a71d4f163b1571075ad3cae 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp @@ -673,18 +673,12 @@ QString Qt4RunConfiguration::proFilePath() const QString Qt4RunConfiguration::dumperLibrary() const { - QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target()->kit()); - if (version) - return version->gdbDebuggingHelperLibrary(); - return QString(); + return QtSupport::QtKitInformation::dumperLibrary(target()->kit()); } QStringList Qt4RunConfiguration::dumperLibraryLocations() const { - QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target()->kit()); - if (version) - return version->debuggingHelperLibraryLocations(); - return QStringList(); + return QtSupport::QtKitInformation::dumperLibraryLocations(target()->kit()); } QString Qt4RunConfiguration::defaultDisplayName() diff --git a/src/plugins/qtsupport/customexecutablerunconfiguration.cpp b/src/plugins/qtsupport/customexecutablerunconfiguration.cpp index 807488aa6e766852fcc16ddb4a08f783ab971b66..b13863ca6d0b8699ae2cea3cfc65d660857249a2 100644 --- a/src/plugins/qtsupport/customexecutablerunconfiguration.cpp +++ b/src/plugins/qtsupport/customexecutablerunconfiguration.cpp @@ -29,7 +29,7 @@ #include "customexecutablerunconfiguration.h" #include "customexecutableconfigurationwidget.h" -#include "debugginghelper.h" +#include "qtkitinformation.h" #include <projectexplorer/buildconfiguration.h> #include <projectexplorer/project.h> @@ -365,16 +365,12 @@ QWidget *CustomExecutableRunConfiguration::createConfigurationWidget() QString CustomExecutableRunConfiguration::dumperLibrary() const { - Utils::FileName qmakePath = DebuggingHelperLibrary::findSystemQt(environment()); - QString qtInstallData = DebuggingHelperLibrary::qtInstallDataDir(qmakePath); - return DebuggingHelperLibrary::debuggingHelperLibraryByInstallData(qtInstallData); + return QtKitInformation::dumperLibrary(target()->kit()); } QStringList CustomExecutableRunConfiguration::dumperLibraryLocations() const { - Utils::FileName qmakePath = DebuggingHelperLibrary::findSystemQt(environment()); - QString qtInstallData = DebuggingHelperLibrary::qtInstallDataDir(qmakePath); - return DebuggingHelperLibrary::debuggingHelperLibraryDirectories(qtInstallData); + return QtKitInformation::dumperLibraryLocations(target()->kit()); } ProjectExplorer::Abi CustomExecutableRunConfiguration::abi() const diff --git a/src/plugins/qtsupport/qtkitinformation.cpp b/src/plugins/qtsupport/qtkitinformation.cpp index d3ffd563525a3e91dc0a54dc667bd49948546be6..766c9ea5d320f2349674099f8137d3a8beb00b38 100644 --- a/src/plugins/qtsupport/qtkitinformation.cpp +++ b/src/plugins/qtsupport/qtkitinformation.cpp @@ -180,6 +180,22 @@ void QtKitInformation::setQtVersion(ProjectExplorer::Kit *k, const BaseQtVersion setQtVersionId(k, v->uniqueId()); } +QString QtKitInformation::dumperLibrary(const ProjectExplorer::Kit *k) +{ + BaseQtVersion *version = QtKitInformation::qtVersion(k); + if (version) + return version->gdbDebuggingHelperLibrary(); + return QString(); +} + +QStringList QtKitInformation::dumperLibraryLocations(const ProjectExplorer::Kit *k) +{ + BaseQtVersion *version = QtKitInformation::qtVersion(k); + if (version) + return version->debuggingHelperLibraryLocations(); + return QStringList(); +} + void QtKitInformation::qtVersionsChanged(const QList<int> &addedIds, const QList<int> &removedIds, const QList<int> &changedIds) diff --git a/src/plugins/qtsupport/qtkitinformation.h b/src/plugins/qtsupport/qtkitinformation.h index b4ae29d6f445888c32bfda92fa3dd838d995b666..8a4391a1075438aaad856dc5a916349ad51da4fa 100644 --- a/src/plugins/qtsupport/qtkitinformation.h +++ b/src/plugins/qtsupport/qtkitinformation.h @@ -69,6 +69,11 @@ public: static BaseQtVersion *qtVersion(const ProjectExplorer::Kit *k); static void setQtVersion(ProjectExplorer::Kit *k, const BaseQtVersion *v); + // Information derived from the Qt version: + // FIXME: This should be part of an RunConfigurationAspect... + static QString dumperLibrary(const ProjectExplorer::Kit *k); + static QStringList dumperLibraryLocations(const ProjectExplorer::Kit *k); + private slots: void qtVersionsChanged(const QList<int> &addedIds, const QList<int> &removedIds,