aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-qt/qt4/qt4-x11-free/0008-qt-lib-infix.patch
blob: 3efaff37d36e7e6827dde857d31a8503bcd3d934 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
Index: qt-embedded-linux-opensource-src-4.5.0/mkspecs/features/uitools.prf
===================================================================
--- qt-embedded-linux-opensource-src-4.5.0.orig/mkspecs/features/uitools.prf	2009-02-25 22:32:34.000000000 +0100
+++ qt-embedded-linux-opensource-src-4.5.0/mkspecs/features/uitools.prf	2009-03-26 17:17:27.000000000 +0100
@@ -2,10 +2,10 @@
 qt:load(qt)
 
 # Include the correct version of the UiLoader library
-QTUITOOLS_LINKAGE = -lQtUiTools
+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
 
Index: qt-embedded-linux-opensource-src-4.5.0/tools/designer/src/uitools/uitools.pro
===================================================================
--- qt-embedded-linux-opensource-src-4.5.0.orig/tools/designer/src/uitools/uitools.pro	2009-02-25 22:32:42.000000000 +0100
+++ qt-embedded-linux-opensource-src-4.5.0/tools/designer/src/uitools/uitools.pro	2009-03-26 17:17:27.000000000 +0100
@@ -1,5 +1,5 @@
 TEMPLATE = lib
-TARGET = $$qtLibraryTarget(QtUiTools)
+TARGET = QtUiTools
 QT += xml
 CONFIG += qt staticlib
 DESTDIR = ../../../../lib
@@ -39,3 +39,4 @@
    QMAKE_PKGCONFIG_REQUIRES += QtXml
 }
 
+TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end