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:
	qtcreator.pri
	src/plugins/debugger/breakhandler.cpp
	src/plugins/qt4projectmanager/qtversionmanager.cpp
This commit is contained in:
con
2011-04-18 13:57:07 +02:00
parent a10e3a04d0 d7e1d74aac
commit 5b02bf94a8
57 changed files with 9576 additions and 1683 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1697,7 +1697,7 @@ void CdbEngine::handleLocals(const CdbExtensionCommandPtr &reply)
if (forNewStackFrame)
emit stackFrameCompleted();
} else {
showMessage(QString::fromLatin1(reply->errorMessage), LogError);
showMessage(QString::fromLatin1(reply->errorMessage), LogWarning);
}
}