Commit 4b49d4f7 authored by Kai Koehne's avatar Kai Koehne

QtVersion: Rename 'debuggingHelper' to 'gdbDebuggingHelper'

Avoid confusion with other debugging helpers.
parent 8b5f742f
......@@ -661,7 +661,7 @@ QString Qt4RunConfiguration::dumperLibrary() const
{
QtVersion *version = qt4Target()->activeBuildConfiguration()->qtVersion();
if (version)
return version->debuggingHelperLibrary();
return version->gdbDebuggingHelperLibrary();
return QString();
}
......
......@@ -257,7 +257,7 @@ const QString MaemoRunConfiguration::arguments() const
const QString MaemoRunConfiguration::dumperLib() const
{
Qt4BuildConfiguration *qt4bc(activeQt4BuildConfiguration());
return qt4bc->qtVersion()->debuggingHelperLibrary();
return qt4bc->qtVersion()->gdbDebuggingHelperLibrary();
}
......
......@@ -289,7 +289,7 @@ void QtOptionsPageWidget::debuggingHelperBuildFinished(int qtVersionId, Debuggin
bool success = true;
if (tools & DebuggingHelperBuildTask::GdbDebugging)
success &= qtVersion->hasDebuggingHelper();
success &= qtVersion->hasGdbDebuggingHelper();
if (tools & DebuggingHelperBuildTask::QmlDebugging)
success &= qtVersion->hasQmlDebuggingLibrary();
if (tools & DebuggingHelperBuildTask::QmlDump)
......@@ -452,7 +452,7 @@ void QtOptionsPageWidget::updateDebuggingHelperUi()
bool canBuildQmlDebuggingLib = QmlDebuggingLibrary::canBuild(version);
bool canBuildQmlObserver = QmlObserverTool::canBuild(version);
bool hasGdbHelper = !version->debuggingHelperLibrary().isEmpty();
bool hasGdbHelper = !version->gdbDebuggingHelperLibrary().isEmpty();
bool hasQmlDumper = version->hasQmlDump();
bool hasQmlDebuggingLib = version->hasQmlDebuggingLibrary();
bool hasQmlObserver = !version->qmlObserverTool().isEmpty();
......@@ -495,7 +495,7 @@ void QtOptionsPageWidget::updateDebuggingHelperUi()
QString gdbHelperText;
Qt::TextInteractionFlags gdbHelperTextFlags = Qt::NoTextInteraction;
if (hasGdbHelper) {
gdbHelperText = QDir::toNativeSeparators(version->debuggingHelperLibrary());
gdbHelperText = QDir::toNativeSeparators(version->gdbDebuggingHelperLibrary());
gdbHelperTextFlags = Qt::TextSelectableByMouse;
} else {
gdbHelperText = tr("<i>Not yet built.</i>");
......
......@@ -1777,7 +1777,7 @@ QtVersion::QmakeBuildConfigs QtVersion::defaultBuildConfig() const
return result;
}
bool QtVersion::hasDebuggingHelper() const
bool QtVersion::hasGdbDebuggingHelper() const
{
updateVersionInfo();
return m_hasDebuggingHelper;
......@@ -1817,7 +1817,7 @@ Utils::Environment QtVersion::qmlToolsEnvironment() const
return environment;
}
QString QtVersion::debuggingHelperLibrary() const
QString QtVersion::gdbDebuggingHelperLibrary() const
{
QString qtInstallData = versionInfo().value("QT_INSTALL_DATA");
if (qtInstallData.isEmpty())
......
......@@ -139,13 +139,13 @@ public:
QList<ProjectExplorer::HeaderPath> systemHeaderPathes() const;
bool supportsBinaryDebuggingHelper() const;
bool hasDebuggingHelper() const;
QString debuggingHelperLibrary() const;
QString gdbDebuggingHelperLibrary() const;
QString qmlDebuggingHelperLibrary(bool debugVersion) const;
QString qmlDumpTool(bool debugVersion) const;
QString qmlObserverTool() const;
QStringList debuggingHelperLibraryLocations() const;
bool hasGdbDebuggingHelper() const;
bool hasQmlDump() const;
bool hasQmlDebuggingLibrary() const;
bool hasQmlObserver() const;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment