diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
index 2b7be037969..690ac117b36 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
@@ -661,7 +661,7 @@ QString Qt4RunConfiguration::dumperLibrary() const
{
QtVersion *version = qt4Target()->activeBuildConfiguration()->qtVersion();
if (version)
- return version->debuggingHelperLibrary();
+ return version->gdbDebuggingHelperLibrary();
return QString();
}
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
index a5c99dde599..244ac387f12 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
@@ -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();
}
diff --git a/src/plugins/qt4projectmanager/qtoptionspage.cpp b/src/plugins/qt4projectmanager/qtoptionspage.cpp
index d036eaa0ca8..1eea2e3b7a0 100644
--- a/src/plugins/qt4projectmanager/qtoptionspage.cpp
+++ b/src/plugins/qt4projectmanager/qtoptionspage.cpp
@@ -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("Not yet built.");
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 278e7cca121..1e2d998a012 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -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())
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.h b/src/plugins/qt4projectmanager/qtversionmanager.h
index c79fe6ae19c..086e42f1847 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.h
+++ b/src/plugins/qt4projectmanager/qtversionmanager.h
@@ -139,13 +139,13 @@ public:
QList 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;