diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-12-05 11:58:42 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-12-05 11:58:42 +0100 |
| commit | 072d551c73874fc5ba9b9137af511716fd4bd7f5 (patch) | |
| tree | c0010fb7873a11eae0cd503fd0c13653fe62da3a /src/plugins/qmldesigner/settingspage.ui | |
| parent | d3b8da6cf845561364388449db5edccc03846244 (diff) | |
| parent | 44d254b37bd700e576fa7e0860c061b9e37da5aa (diff) | |
Merge remote-tracking branch 'origin/3.0'
Conflicts:
qtcreator.pri
qtcreator.qbs
Change-Id: I49dca8a41519869f122a4dfdbd6564b357ddeb1e
Diffstat (limited to 'src/plugins/qmldesigner/settingspage.ui')
| -rw-r--r-- | src/plugins/qmldesigner/settingspage.ui | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/plugins/qmldesigner/settingspage.ui b/src/plugins/qmldesigner/settingspage.ui index d154b9258f..528f621d13 100644 --- a/src/plugins/qmldesigner/settingspage.ui +++ b/src/plugins/qmldesigner/settingspage.ui @@ -24,9 +24,6 @@ <layout class="QFormLayout" name="formLayout_4"> <item row="0" column="1"> <widget class="QCheckBox" name="designerShowDebuggerCheckBox"> - <property name="toolTip"> - <string>Warn about QML features which are not properly supported by the Qt Quick Designer</string> - </property> <property name="text"> <string>Show the debugging view</string> </property> @@ -34,9 +31,6 @@ </item> <item row="1" column="1"> <widget class="QCheckBox" name="designerEnableDebuggerCheckBox"> - <property name="toolTip"> - <string>Also warn in the code editor about QML features which are not properly supported by the Qt Quick Designer</string> - </property> <property name="text"> <string>Enable the debugging view</string> </property> |