diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp index 2b7be037969bf2f3b3b1723a59de90aa9e7cad1b..690ac117b36e969e29c7a856abf39631f33f04bd 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 a5c99dde599e5a68490c0ebb89298f25d65de3f3..244ac387f124d446236e019205512c8466937130 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 d036eaa0ca8ecc9b4367e38c63a3568c2665f9c2..1eea2e3b7a05f750f8ca4f7530f83618b7c02519 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("<i>Not yet built.</i>"); diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp index 278e7cca121dc340b5061b53db4e27b567c0e18b..1e2d998a0129bf6a2e53fb1f8d524f12547e8955 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 c79fe6ae19c464e3920ce884a6a54cb41c68f595..086e42f1847642f68e17c0d52aa99d180574146b 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.h +++ b/src/plugins/qt4projectmanager/qtversionmanager.h @@ -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;