summaryrefslogtreecommitdiff
path: root/recipes/qt4/qt-embedded-4.4.3/qt-lib-infix.patch
blob: b1a443f24c8a842af71298f269004a1afe5e7d16 (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
35
36
37
38
39
40
41
42
43
44
45
diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/mkspecs/features/uitools.prf qt-embedded-linux-opensource-src-4.4.3/mkspecs/features/uitools.prf
--- qt-embedded-linux-opensource-src-4.4.3.orig/mkspecs/features/uitools.prf	2008-09-27 11:01:24.000000000 +0200
+++ qt-embedded-linux-opensource-src-4.4.3/mkspecs/features/uitools.prf	2008-12-11 20:47:10.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
 
diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/tools/designer/src/lib/lib.pro qt-embedded-linux-opensource-src-4.4.3/tools/designer/src/lib/lib.pro
--- qt-embedded-linux-opensource-src-4.4.3.orig/tools/designer/src/lib/lib.pro	2008-09-27 11:01:29.000000000 +0200
+++ qt-embedded-linux-opensource-src-4.4.3/tools/designer/src/lib/lib.pro	2008-12-11 20:36:40.000000000 +0100
@@ -58,8 +58,8 @@
 include(shared/shared.pri)
 PRECOMPILED_HEADER=lib_pch.h
 
-include(../components/component.pri)
 include(../sharedcomponents.pri)
+include(../components/component.pri)
 
 target.path=$$[QT_INSTALL_LIBS]
 INSTALLS        += target
diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/tools/designer/src/uitools/uitools.pro qt-embedded-linux-opensource-src-4.4.3/tools/designer/src/uitools/uitools.pro
--- qt-embedded-linux-opensource-src-4.4.3.orig/tools/designer/src/uitools/uitools.pro	2008-09-27 11:01:30.000000000 +0200
+++ qt-embedded-linux-opensource-src-4.4.3/tools/designer/src/uitools/uitools.pro	2008-12-11 19:56:34.000000000 +0100
@@ -1,5 +1,5 @@
 TEMPLATE = lib
-TARGET = $$qtLibraryTarget(QtUiTools)
+TARGET = QtUiTools
 QT += xml
 CONFIG += qt staticlib
 DESTDIR = ../../../../lib
@@ -38,3 +38,4 @@
    QMAKE_PKGCONFIG_DESTDIR = pkgconfig
 }
 
+TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end