Commit e0f7b845 authored by hjk's avatar hjk Committed by con
Browse files

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 01284f21)
parent b6d7fecf
...@@ -3166,7 +3166,7 @@ void GdbEngine::runDebuggingHelper(const WatchData &data0, bool dumpChildren) ...@@ -3166,7 +3166,7 @@ void GdbEngine::runDebuggingHelper(const WatchData &data0, bool dumpChildren)
.arg(m_pendingRequests + 1), 10000); .arg(m_pendingRequests + 1), 10000);
// retrieve response // retrieve response
sendSynchronizedCommand("p (char*)qDumpOutBuffer", WatchDebuggingHelperValue2, var); sendSynchronizedCommand("p (char*)&qDumpOutBuffer", WatchDebuggingHelperValue2, var);
} }
void GdbEngine::createGdbVariable(const WatchData &data) void GdbEngine::createGdbVariable(const WatchData &data)
...@@ -4180,14 +4180,14 @@ void GdbEngine::tryLoadDebuggingHelpers() ...@@ -4180,14 +4180,14 @@ void GdbEngine::tryLoadDebuggingHelpers()
#endif #endif
// retreive list of dumpable classes // retreive list of dumpable classes
sendCommand("call qDumpObjectData440(1,%1+1,0,0,0,0,0,0)"); 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() void GdbEngine::recheckDebuggingHelperAvailability()
{ {
// retreive list of dumpable classes // retreive list of dumpable classes
sendCommand("call qDumpObjectData440(1,%1+1,0,0,0,0,0,0)"); 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) IDebuggerEngine *createGdbEngine(DebuggerManager *parent)
......
...@@ -605,8 +605,8 @@ void QtDirWidget::showEnvironmentPage(QTreeWidgetItem *item) ...@@ -605,8 +605,8 @@ void QtDirWidget::showEnvironmentPage(QTreeWidgetItem *item)
m_ui.msvcComboBox->setVisible(false); m_ui.msvcComboBox->setVisible(false);
makeMingwVisible(false); makeMingwVisible(false);
if (!m_versions.at(index)->isInstalled()) 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(m_versions.at(index)->path())); .arg(QDir::toNativeSeparators(m_versions.at(index)->path())));
else else
m_ui.errorLabel->setText(tr("%1 is not a valid qt directory").arg(m_versions.at(index)->path())); m_ui.errorLabel->setText(tr("%1 is not a valid qt directory").arg(m_versions.at(index)->path()));
} else { //ProjectExplorer::ToolChain::GCC } else { //ProjectExplorer::ToolChain::GCC
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment