diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp index 0772632c9a4..40f05c9f746 100644 --- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include @@ -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 55ab79ee374..c69f1546034 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 807488aa6e7..b13863ca6d0 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 #include @@ -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 d3ffd563525..766c9ea5d32 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 &addedIds, const QList &removedIds, const QList &changedIds) diff --git a/src/plugins/qtsupport/qtkitinformation.h b/src/plugins/qtsupport/qtkitinformation.h index b4ae29d6f44..8a4391a1075 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 &addedIds, const QList &removedIds,