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

24
src/plugins/debugger/debuggeractions.cpp
View File

@@ -549,6 +549,30 @@ DebuggerSettings::DebuggerSettings(QSettings *settings)
item->setSettingsKey(debugModeGroup, QLatin1String("WatchdogTimeout"));
item->setDefaultValue(20);
insertItem(GdbWatchdogTimeout, item);
//
// QML Tools
//
item = new SavedAction(this);
item->setSettingsKey(debugModeGroup, QLatin1String("ShowQmlObjectTree"));
item->setDefaultValue(true);
insertItem(ShowQmlObjectTree, item);
item = new SavedAction(this);
item->setSettingsKey("QML.Inspector", QLatin1String("QmlInspector.ShowAppOnTop"));
item->setText(tr("Show Application On Top"));
item->setCheckable(true);
item->setDefaultValue(false);
item->setIcon(QIcon(QLatin1String(":/debugger/images/qml/app-on-top.png")));
insertItem(ShowAppOnTop, item);
item = new SavedAction(this);
item->setSettingsKey("QML.Inspector", QLatin1String("QmlInspector.FromQml"));
item->setText(tr("Apply Changes on Save"));
item->setCheckable(true);
item->setDefaultValue(false);
item->setIcon(QIcon(QLatin1String(":/debugger/images/qml/apply-on-save.png")));
insertItem(QmlUpdateOnSave, item);
}
DebuggerSettings::~DebuggerSettings()