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

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	share/share.qbs
	src/plugins/cpptools/cppchecksymbols.cpp
	src/plugins/texteditor/behaviorsettingswidget.cpp

Change-Id: Ia34060984f9c036b2f28a6411d796d41f55a3e37
This commit is contained in:
Eike Ziller
2012-11-27 11:50:56 +01:00
parent c384f52b49 deeef5308f
commit ba1d5f2cdf
44 changed files with 276 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/debugger/qml/qmlengine.h
View File

@@ -162,6 +162,7 @@ private:
bool supportsThreads() const { return false; }
void updateWatchData(const WatchData &data,
const WatchUpdateFlags &flags);
void watchDataSelected(const QByteArray &iname);
void executeDebuggerCommand(const QString &command, DebuggerLanguages languages);
bool evaluateScript(const QString &expression);