From ceda1f6dc0bafae2516496b54c76c3b89c079951 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Fri, 25 Mar 2011 15:43:21 +0100
Subject: Make QtUiTools use the lib-infix passed to configure.

Patch contributed by OpenEmbedded project.

Reviewed-by: hjk
Task-number: QTBUG-7169
---
 mkspecs/features/uitools.prf           | 6 +++---
 tools/designer/src/uitools/uitools.pro | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/mkspecs/features/uitools.prf b/mkspecs/features/uitools.prf
index 2d14b04..6599577 100644
--- a/mkspecs/features/uitools.prf
+++ b/mkspecs/features/uitools.prf
@@ -3,11 +3,11 @@ qt:load(qt)
 
 # Include the correct version of the UiLoader library
 symbian: QTUITOOLS_LINKAGE = -lQtUiTools.lib
-else: QTUITOOLS_LINKAGE = -lQtUiTools
+else: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}
 
 CONFIG(debug, debug|release) {
-    mac: QTUITOOLS_LINKAGE = -lQtUiTools_debug
-    win32: QTUITOOLS_LINKAGE = -lQtUiToolsd
+    mac: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}_debug
+    win32: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}d
 }
 LIBS += $$QTUITOOLS_LINKAGE
 
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
-- 
cgit v0.12


From 48e91e6beb3cefbc15e583dcdb6005a7d9278104 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Mon, 28 Mar 2011 09:46:59 +0200
Subject: Designer: Fix tab order in action editor dialog.

Task-number: QTBUG-18400
---
 tools/designer/src/lib/shared/newactiondialog.ui | 96 ++++++++++++------------
 1 file changed, 48 insertions(+), 48 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>
-- 
cgit v0.12