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:
	qtcreator.pri
	src/libs/libs.pro
	src/plugins/debugger/watchwindow.cpp
	src/plugins/remotelinux/maemopackagecreationstep.h

Change-Id: Ic67c46256d0060ee9845b92ef82539f6f8fbe639
This commit is contained in:
Eike Ziller
2011-08-10 16:03:57 +02:00
parent 01bb7443fd d78d7dbce3
commit 99ba300ae3
140 changed files with 1585 additions and 1298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/debugger/qml/qmlcppengine.h
View File

@@ -123,9 +123,6 @@ protected:
void notifyEngineRunAndInferiorRunOk();
void notifyInferiorShutdownOk();
protected slots:
void skipCppBreakpoint();
private:
void engineStateChanged(DebuggerState newState);
void setState(DebuggerState newState, bool forced = false);