diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2012-04-18 14:20:54 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@nokia.com> | 2012-05-09 12:42:44 +0200 |
| commit | 7f09d0b756ff3f9bb52737d4aaf65ed84d751316 (patch) | |
| tree | 7469486e35fd0b6a3e7c4e7e8775f75784c414fd /src/plugins/debugger/commonoptionspage.cpp | |
| parent | d201c681daae42b005c9ea4f3a1e272ea9cc5ef5 (diff) | |
| download | qt-creator-7f09d0b756ff3f9bb52737d4aaf65ed84d751316.tar.gz | |
Merge QML inspector into debugger plugin
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>
Diffstat (limited to 'src/plugins/debugger/commonoptionspage.cpp')
| -rw-r--r-- | src/plugins/debugger/commonoptionspage.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/debugger/commonoptionspage.cpp b/src/plugins/debugger/commonoptionspage.cpp index f8eb6db6b7..4bd4512b9a 100644 --- a/src/plugins/debugger/commonoptionspage.cpp +++ b/src/plugins/debugger/commonoptionspage.cpp @@ -74,6 +74,8 @@ CommonOptionsPageWidget::CommonOptionsPageWidget m_ui.checkBoxSwitchModeOnExit); m_group->insert(dc->action(RaiseOnInterrupt), m_ui.checkBoxBringToForegroundOnInterrrupt); + m_group->insert(dc->action(ShowQmlObjectTree), + m_ui.checkBoxShowQmlObjectTree); m_group->insert(dc->action(FontSizeFollowsEditor), m_ui.checkBoxFontSizeFollowsEditor); m_group->insert(dc->action(AutoDerefPointers), 0); @@ -123,6 +125,7 @@ QString CommonOptionsPageWidget::searchKeyWords() const << sep << m_ui.checkBoxSwitchModeOnExit->text() << sep << m_ui.labelMaximalStackDepth->text() << sep << m_ui.checkBoxBringToForegroundOnInterrrupt->text() + << sep << m_ui.checkBoxShowQmlObjectTree->text() ; rc.remove(QLatin1Char('&')); return rc; |