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

Merge QML inspector into debugger plugin

Browse Source 
Merge QmlJSInspector plugin into the debugger. Also merge the
extra Inspector window with the Locals & Watchers: It now shows
the QML object tree in the running state.

Change-Id: I59ae0c1b970a48ba10ecda92ed3ba765d94b1d9c
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
This commit is contained in:
Kai Koehne
2012-04-18 14:20:54 +02:00
parent d201c681da
commit 7f09d0b756
80 changed files with 2669 additions and 5187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,15 +49,13 @@ class IEditor;
}
namespace Debugger {
class QmlAdapter;
namespace Internal {
class QtMessageLogItem;
class QmlAdapter;
class QmlEnginePrivate;
class DEBUGGER_EXPORT QmlEngine : public DebuggerEngine
class QmlEngine : public DebuggerEngine
{
Q_OBJECT