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

Merge remote-tracking branch 'origin/2.3'

Browse Source 
Conflicts:
	doc/qtcreator.qdoc
	qtcreator.pri

Change-Id: I8b34546dccc031aeeeab03417e9bd3aa7b740472
This commit is contained in:
Eike Ziller
2011-08-30 15:59:07 +02:00
parent 90a7786dde bc7abeb602
commit 57ae91c5ef
61 changed files with 26249 additions and 30932 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/debugger/qml/qmlcppengine.cpp
View File

@@ -129,7 +129,7 @@ void QmlCppEnginePrivate::qmlStackChanged()
{
StackFrames frames = m_qmlEngine->stackHandler()->frames();
q->stackHandler()->setFrames(frames);
m_stackBoundary = frames.size();
m_stackBoundary = 0;
}