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

Merge remote branch 'origin/2.2'

Browse Source 
Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.h
This commit is contained in:
con
2011-04-01 09:53:09 +02:00
parent 12fd1dbb70 eb03bd1a93
commit 1c2da511b9
140 changed files with 1139 additions and 2743 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -740,7 +740,7 @@ bool CdbEngine::launchCDB(const DebuggerStartParameters &sp, QString *errorMessa
arguments << QLatin1String("-lines") << QLatin1String("-G")
// register idle (debuggee stop) notification
<< QLatin1String("-c")
<< QString::fromAscii(".idle_cmd " + m_extensionCommandPrefixBA + "idle");
<< QLatin1String(".idle_cmd ") + QString::fromAscii(m_extensionCommandPrefixBA) + QLatin1String("idle");
if (sp.useTerminal) // Separate console
arguments << QLatin1String("-2");
if (!m_options->symbolPaths.isEmpty())
@@ -2336,7 +2336,7 @@ bool CdbEngine::acceptsBreakpoint(BreakpointId id) const
switch (data.type) {
case UnknownType:
case BreakpointAtFork:
case BreakpointAtVFork:
//case BreakpointAtVFork:
case BreakpointAtSysCall:
return false;
case Watchpoint: