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

Unify handling of dumperLibrary/dumperLibraryLocations

Browse Source 
across its uses. We have the kits now, so we can use the information
from there and no longer need to guess at the dumpers to use.

Change-Id: I058304198e9c7fdbad45a84658e1bcea8ed9834d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2013-04-09 12:05:15 +02:00
parent 403f41efb7
commit e0f05e3b33
5 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
View File

@@ -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