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

QtVersion: Rename 'debuggingHelper' to 'gdbDebuggingHelper'

Browse Source 
Avoid confusion with other debugging helpers.
This commit is contained in:
Kai Koehne
2011-02-24 10:12:52 +01:00
parent 8b5f742fdf
commit 4b49d4f74c
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
View File

@@ -661,7 +661,7 @@ QString Qt4RunConfiguration::dumperLibrary() const
{ {
QtVersion *version = qt4Target()->activeBuildConfiguration()->qtVersion(); QtVersion *version = qt4Target()->activeBuildConfiguration()->qtVersion();
if (version) if (version)
return version->debuggingHelperLibrary(); return version->gdbDebuggingHelperLibrary();
return QString(); return QString();
} }

2
src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
View File

@@ -257,7 +257,7 @@ const QString MaemoRunConfiguration::arguments() const
const QString MaemoRunConfiguration::dumperLib() const const QString MaemoRunConfiguration::dumperLib() const
{ {
Qt4BuildConfiguration *qt4bc(activeQt4BuildConfiguration()); Qt4BuildConfiguration *qt4bc(activeQt4BuildConfiguration());
return qt4bc->qtVersion()->debuggingHelperLibrary(); return qt4bc->qtVersion()->gdbDebuggingHelperLibrary();
} }

6
src/plugins/qt4projectmanager/qtoptionspage.cpp
View File

@@ -289,7 +289,7 @@ void QtOptionsPageWidget::debuggingHelperBuildFinished(int qtVersionId, Debuggin
bool success = true; bool success = true;
if (tools & DebuggingHelperBuildTask::GdbDebugging) if (tools & DebuggingHelperBuildTask::GdbDebugging)
success &= qtVersion->hasDebuggingHelper(); success &= qtVersion->hasGdbDebuggingHelper();
if (tools & DebuggingHelperBuildTask::QmlDebugging) if (tools & DebuggingHelperBuildTask::QmlDebugging)
success &= qtVersion->hasQmlDebuggingLibrary(); success &= qtVersion->hasQmlDebuggingLibrary();
if (tools & DebuggingHelperBuildTask::QmlDump) if (tools & DebuggingHelperBuildTask::QmlDump)
@@ -452,7 +452,7 @@ void QtOptionsPageWidget::updateDebuggingHelperUi()
bool canBuildQmlDebuggingLib = QmlDebuggingLibrary::canBuild(version); bool canBuildQmlDebuggingLib = QmlDebuggingLibrary::canBuild(version);
bool canBuildQmlObserver = QmlObserverTool::canBuild(version); bool canBuildQmlObserver = QmlObserverTool::canBuild(version);
bool hasGdbHelper = !version->debuggingHelperLibrary().isEmpty(); bool hasGdbHelper = !version->gdbDebuggingHelperLibrary().isEmpty();
bool hasQmlDumper = version->hasQmlDump(); bool hasQmlDumper = version->hasQmlDump();
bool hasQmlDebuggingLib = version->hasQmlDebuggingLibrary(); bool hasQmlDebuggingLib = version->hasQmlDebuggingLibrary();
bool hasQmlObserver = !version->qmlObserverTool().isEmpty(); bool hasQmlObserver = !version->qmlObserverTool().isEmpty();
@@ -495,7 +495,7 @@ void QtOptionsPageWidget::updateDebuggingHelperUi()
QString gdbHelperText; QString gdbHelperText;
Qt::TextInteractionFlags gdbHelperTextFlags = Qt::NoTextInteraction; Qt::TextInteractionFlags gdbHelperTextFlags = Qt::NoTextInteraction;
if (hasGdbHelper) { if (hasGdbHelper) {
gdbHelperText = QDir::toNativeSeparators(version->debuggingHelperLibrary()); gdbHelperText = QDir::toNativeSeparators(version->gdbDebuggingHelperLibrary());
gdbHelperTextFlags = Qt::TextSelectableByMouse; gdbHelperTextFlags = Qt::TextSelectableByMouse;
} else { } else {
gdbHelperText = tr("<i>Not yet built.</i>"); gdbHelperText = tr("<i>Not yet built.</i>");

4
src/plugins/qt4projectmanager/qtversionmanager.cpp
View File

@@ -1777,7 +1777,7 @@ QtVersion::QmakeBuildConfigs QtVersion::defaultBuildConfig() const
return result; return result;
} }
bool QtVersion::hasDebuggingHelper() const bool QtVersion::hasGdbDebuggingHelper() const
{ {
updateVersionInfo(); updateVersionInfo();
return m_hasDebuggingHelper; return m_hasDebuggingHelper;
@@ -1817,7 +1817,7 @@ Utils::Environment QtVersion::qmlToolsEnvironment() const
return environment; return environment;
} }
QString QtVersion::debuggingHelperLibrary() const QString QtVersion::gdbDebuggingHelperLibrary() const
{ {
QString qtInstallData = versionInfo().value("QT_INSTALL_DATA"); QString qtInstallData = versionInfo().value("QT_INSTALL_DATA");
if (qtInstallData.isEmpty()) if (qtInstallData.isEmpty())

4
src/plugins/qt4projectmanager/qtversionmanager.h
View File

@@ -139,13 +139,13 @@ public:
QList<ProjectExplorer::HeaderPath> systemHeaderPathes() const; QList<ProjectExplorer::HeaderPath> systemHeaderPathes() const;
bool supportsBinaryDebuggingHelper() const; bool supportsBinaryDebuggingHelper() const;
bool hasDebuggingHelper() const; QString gdbDebuggingHelperLibrary() const;
QString debuggingHelperLibrary() const;
QString qmlDebuggingHelperLibrary(bool debugVersion) const; QString qmlDebuggingHelperLibrary(bool debugVersion) const;
QString qmlDumpTool(bool debugVersion) const; QString qmlDumpTool(bool debugVersion) const;
QString qmlObserverTool() const; QString qmlObserverTool() const;
QStringList debuggingHelperLibraryLocations() const; QStringList debuggingHelperLibraryLocations() const;
bool hasGdbDebuggingHelper() const;
bool hasQmlDump() const; bool hasQmlDump() const;
bool hasQmlDebuggingLibrary() const; bool hasQmlDebuggingLibrary() const;
bool hasQmlObserver() const; bool hasQmlObserver() const;