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.ui | |
| 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.ui')
| -rw-r--r-- | src/plugins/debugger/commonoptionspage.ui | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/plugins/debugger/commonoptionspage.ui b/src/plugins/debugger/commonoptionspage.ui index b44f2f36cb..548ed122da 100644 --- a/src/plugins/debugger/commonoptionspage.ui +++ b/src/plugins/debugger/commonoptionspage.ui @@ -120,7 +120,14 @@ </item> </layout> </item> - <item row="3" column="1"> + <item row="3" column="0"> + <widget class="QCheckBox" name="checkBoxBringToForegroundOnInterrrupt"> + <property name="text"> + <string>Bring Qt Creator to foreground when application interrupts</string> + </property> + </widget> + </item> + <item row="4" column="1"> <widget class="QCheckBox" name="checkBoxRegisterForPostMortem"> <property name="toolTip"> <string>Register Qt Creator for debugging crashed applications.</string> @@ -130,10 +137,13 @@ </property> </widget> </item> - <item row="3" column="0"> - <widget class="QCheckBox" name="checkBoxBringToForegroundOnInterrrupt"> + <item row="3" column="1"> + <widget class="QCheckBox" name="checkBoxShowQmlObjectTree"> + <property name="toolTip"> + <string>Show QML object tree in Locals & Expressions when connected and not stepping.</string> + </property> <property name="text"> - <string>Bring Qt Creator to foreground when application interrupts</string> + <string>Show QML object tree</string> </property> </widget> </item> |