summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4-4.8.1/0008-qt-lib-infix.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-09-26 20:13:11 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-02 17:19:27 +0100
commitb0862a5cf2ba2878e7fefa5193acae3a82ea46fd (patch)
tree2281286b22e424616e1889a6077fcd6d5415dbec /meta/recipes-qt/qt4/qt4-4.8.1/0008-qt-lib-infix.patch
parentee14710dbf1c4383ca20851529684f164883cc80 (diff)
downloadpoky-b0862a5cf2ba2878e7fefa5193acae3a82ea46fd.tar.gz
qt4: move patches from files to qt4-4.8.1
* faster lookup in FILESPATH as small bonus (From OE-Core rev: 8cc54d2d154b2ed9f931da39d75dc9c135f5e26d) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.1/0008-qt-lib-infix.patch')
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/0008-qt-lib-infix.patch41
1 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0008-qt-lib-infix.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0008-qt-lib-infix.patch
new file mode 100644
index 0000000000..d308a15cf8
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0008-qt-lib-infix.patch
@@ -0,0 +1,41 @@
1Add lib infix for QtUiTools to distinguish different Qt edition: e.g. "E" for embedded, "" for X11
2
3Patch has been accepted upstream and should be included in the next major version (4.8.0), see:
4http://bugreports.qt.nokia.com/browse/QTBUG-7169
5
6Original Author: Jeremy Lainé <jeremy.laine@m4x.org>
7Ported from OE by: Yu Ke <ke.yu@intel.com>
8Upstream-Status: Accepted
9
10--- /tmp/uitools.prf 2009-12-01 18:38:22.000000000 +0100
11+++ qt-everywhere-opensource-src-4.6.0/mkspecs/features/uitools.prf 2009-12-01 18:58:16.000000000 +0100
12@@ -3,11 +3,11 @@
13
14 # Include the correct version of the UiLoader library
15 symbian: QTUITOOLS_LINKAGE = -lQtUiTools.lib
16-else: QTUITOOLS_LINKAGE = -lQtUiTools
17+else: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}
18
19 CONFIG(debug, debug|release) {
20- mac: QTUITOOLS_LINKAGE = -lQtUiTools_debug
21- win32: QTUITOOLS_LINKAGE = -lQtUiToolsd
22+ mac: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}_debug
23+ win32: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}d
24 }
25 LIBS += $$QTUITOOLS_LINKAGE
26
27--- /tmp/uitools.pro 2009-12-01 18:40:28.000000000 +0100
28+++ qt-everywhere-opensource-src-4.6.0/tools/designer/src/uitools/uitools.pro 2009-12-01 18:59:18.000000000 +0100
29@@ -1,5 +1,5 @@
30 TEMPLATE = lib
31-TARGET = $$qtLibraryTarget(QtUiTools)
32+TARGET = QtUiTools
33 QT += xml
34 CONFIG += qt staticlib
35 DESTDIR = ../../../../lib
36@@ -43,3 +43,5 @@
37 QMAKE_PKGCONFIG_DESTDIR = pkgconfig
38 QMAKE_PKGCONFIG_REQUIRES += QtXml
39 }
40+
41+TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end