summaryrefslogtreecommitdiffstats
path: root/tools/designer
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-03-28 08:07:04 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-03-28 08:07:04 (GMT)
commit4da2ba2e788bb63a155e1d10ae559d4366eed875 (patch)
tree8ab88bdb3e59fa5ca6eab5ce8ab03445b138c591 /tools/designer
parentaee4087d62900624822ea820b1eb8e2d960d0869 (diff)
parent48e91e6beb3cefbc15e583dcdb6005a7d9278104 (diff)
downloadQt-4da2ba2e788bb63a155e1d10ae559d4366eed875.zip
Qt-4da2ba2e788bb63a155e1d10ae559d4366eed875.tar.gz
Qt-4da2ba2e788bb63a155e1d10ae559d4366eed875.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: Designer: Fix tab order in action editor dialog. Make QtUiTools use the lib-infix passed to configure.
Diffstat (limited to 'tools/designer')
-rw-r--r--tools/designer/src/lib/shared/newactiondialog.ui96
-rw-r--r--tools/designer/src/uitools/uitools.pro4
2 files changed, 51 insertions, 49 deletions
diff --git a/tools/designer/src/lib/shared/newactiondialog.ui b/tools/designer/src/lib/shared/newactiondialog.ui
index 17b5d64..aef9710 100644
--- a/tools/designer/src/lib/shared/newactiondialog.ui
+++ b/tools/designer/src/lib/shared/newactiondialog.ui
@@ -89,6 +89,50 @@
<item row="1" column="1">
<widget class="QLineEdit" name="editObjectName"/>
</item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="toolTipLabel">
+ <property name="text">
+ <string>T&amp;oolTip:</string>
+ </property>
+ <property name="buddy">
+ <cstring>tooltipEditor</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <layout class="QHBoxLayout" name="toolTipLayout">
+ <item>
+ <widget class="TextPropertyEditor" name="tooltipEditor" native="true">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="toolTipToolButton">
+ <property name="text">
+ <string>...</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="iconThemeLabel">
+ <property name="text">
+ <string>Icon th&amp;eme:</string>
+ </property>
+ <property name="buddy">
+ <cstring>iconThemeEditor</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="qdesigner_internal::IconThemeEditor" name="iconThemeEditor" native="true"/>
+ </item>
<item row="4" column="0">
<widget class="QLabel" name="iconLabel">
<property name="text">
@@ -119,16 +163,6 @@
</item>
</layout>
</item>
- <item row="6" column="0">
- <widget class="QLabel" name="shortcutLabel">
- <property name="text">
- <string>&amp;Shortcut:</string>
- </property>
- <property name="buddy">
- <cstring>keySequenceEdit</cstring>
- </property>
- </widget>
- </item>
<item row="5" column="1">
<widget class="QCheckBox" name="checkableCheckBox">
<property name="text">
@@ -146,37 +180,16 @@
</property>
</widget>
</item>
- <item row="2" column="0">
- <widget class="QLabel" name="toolTipLabel">
+ <item row="6" column="0">
+ <widget class="QLabel" name="shortcutLabel">
<property name="text">
- <string>T&amp;oolTip:</string>
+ <string>&amp;Shortcut:</string>
</property>
<property name="buddy">
- <cstring>tooltipEditor</cstring>
+ <cstring>keySequenceEdit</cstring>
</property>
</widget>
</item>
- <item row="2" column="1">
- <layout class="QHBoxLayout" name="toolTipLayout">
- <item>
- <widget class="TextPropertyEditor" name="tooltipEditor" native="true">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QToolButton" name="toolTipToolButton">
- <property name="text">
- <string>...</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
<item row="6" column="1">
<layout class="QHBoxLayout" name="keysequenceLayout">
<item>
@@ -198,19 +211,6 @@
</item>
</layout>
</item>
- <item row="3" column="0">
- <widget class="QLabel" name="iconThemeLabel">
- <property name="text">
- <string>Icon th&amp;eme:</string>
- </property>
- <property name="buddy">
- <cstring>iconThemeEditor</cstring>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="qdesigner_internal::IconThemeEditor" name="iconThemeEditor" native="true"/>
- </item>
</layout>
</item>
<item>
diff --git a/tools/designer/src/uitools/uitools.pro b/tools/designer/src/uitools/uitools.pro
index 6e0a247..be46afc 100644
--- a/tools/designer/src/uitools/uitools.pro
+++ b/tools/designer/src/uitools/uitools.pro
@@ -1,5 +1,5 @@
TEMPLATE = lib
-TARGET = $$qtLibraryTarget(QtUiTools)
+TARGET = QtUiTools
QT += xml
CONFIG += qt staticlib
DESTDIR = ../../../../lib
@@ -43,3 +43,5 @@ unix|win32-g++* {
QMAKE_PKGCONFIG_DESTDIR = pkgconfig
QMAKE_PKGCONFIG_REQUIRES += QtXml
}
+
+TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end