diff options
| author | hjk <qtc-committer@nokia.com> | 2009-04-17 13:58:49 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2009-04-21 16:05:51 +0200 |
| commit | e0f7b845aa2a794a2f4d994d319f276deee7e134 (patch) | |
| tree | 79b3c57e6eb36bfda72b23d8a6d76c7924cce4e6 | |
| parent | b6d7fecf801449894d2e82719d94da5fc364963c (diff) | |
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.
(cherry picked from commit 01284f21600970279e611758ad0d115fa35af4b6)
| -rw-r--r-- | src/plugins/debugger/gdbengine.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/qt4projectmanager/qtversionmanager.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/debugger/gdbengine.cpp b/src/plugins/debugger/gdbengine.cpp index 391890c40e..2f28e095f3 100644 --- a/src/plugins/debugger/gdbengine.cpp +++ b/src/plugins/debugger/gdbengine.cpp @@ -3166,7 +3166,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) @@ -4180,14 +4180,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) diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp index e612ace6f9..85ed9c4630 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.cpp +++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp @@ -605,8 +605,8 @@ 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") - .arg(m_versions.at(index)->path())); + 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(m_versions.at(index)->path())); } else { //ProjectExplorer::ToolChain::GCC |