From 01284f21600970279e611758ad0d115fa35af4b6 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Fri, 17 Apr 2009 13:58:49 +0200
Subject: [PATCH] debugger: use & in "p (char*)&qDumpOutBuffer". This improves
the situation in release builds a bit as we get at least a list of
(afterwards failing) dumpers.
---
src/plugins/debugger/gdbengine.cpp | 6 +++---
src/plugins/qt4projectmanager/qtversionmanager.cpp | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/plugins/debugger/gdbengine.cpp b/src/plugins/debugger/gdbengine.cpp
index 3b2d20b0cd5..7b08b13fbdb 100644
--- a/src/plugins/debugger/gdbengine.cpp
+++ b/src/plugins/debugger/gdbengine.cpp
@@ -3194,7 +3194,7 @@ void GdbEngine::runDebuggingHelper(const WatchData &data0, bool dumpChildren)
.arg(m_pendingRequests + 1), 10000);
// retrieve response
- sendSynchronizedCommand("p (char*)qDumpOutBuffer", WatchDebuggingHelperValue2, var);
+ sendSynchronizedCommand("p (char*)&qDumpOutBuffer", WatchDebuggingHelperValue2, var);
}
void GdbEngine::createGdbVariable(const WatchData &data)
@@ -4208,14 +4208,14 @@ void GdbEngine::tryLoadDebuggingHelpers()
#endif
// retreive list of dumpable classes
sendCommand("call qDumpObjectData440(1,%1+1,0,0,0,0,0,0)");
- sendCommand("p (char*)qDumpOutBuffer", GdbQueryDebuggingHelper);
+ sendCommand("p (char*)&qDumpOutBuffer", GdbQueryDebuggingHelper);
}
void GdbEngine::recheckDebuggingHelperAvailability()
{
// retreive list of dumpable classes
sendCommand("call qDumpObjectData440(1,%1+1,0,0,0,0,0,0)");
- sendCommand("p (char*)qDumpOutBuffer", GdbQueryDebuggingHelper);
+ sendCommand("p (char*)&qDumpOutBuffer", GdbQueryDebuggingHelper);
}
IDebuggerEngine *createGdbEngine(DebuggerManager *parent, QList<Core::IOptionsPage*> *opts)
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 89e233b293b..08c2e37db65 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -605,7 +605,7 @@ void QtDirWidget::showEnvironmentPage(QTreeWidgetItem *item)
m_ui.msvcComboBox->setVisible(false);
makeMingwVisible(false);
if (!m_versions.at(index)->isInstalled())
- m_ui.errorLabel->setText(tr("The Qt Version is not installed. Run make install")
+ m_ui.errorLabel->setText(tr("The Qt Version %1 is not installed. Run make install")
.arg(QDir::toNativeSeparators(m_versions.at(index)->path())));
else
m_ui.errorLabel->setText(tr("%1 is not a valid qt directory").arg(QDir::toNativeSeparators(m_versions.at(index)->path())));
--
GitLab