diff options
Diffstat (limited to 'meta-oe/recipes-qt/qt4/files/0008-qt-lib-infix.patch')
-rw-r--r-- | meta-oe/recipes-qt/qt4/files/0008-qt-lib-infix.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/meta-oe/recipes-qt/qt4/files/0008-qt-lib-infix.patch b/meta-oe/recipes-qt/qt4/files/0008-qt-lib-infix.patch deleted file mode 100644 index a1b89124d..000000000 --- a/meta-oe/recipes-qt/qt4/files/0008-qt-lib-infix.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | Add lib infix to distinguish different qt compile version: e.g. "E" for embedded, "" for X11 | ||
2 | |||
3 | Ported from OE by: Yu Ke <ke.yu@intel.com> | ||
4 | |||
5 | --- /tmp/uitools.prf 2009-12-01 18:38:22.000000000 +0100 | ||
6 | +++ qt-everywhere-opensource-src-4.6.0/mkspecs/features/uitools.prf 2009-12-01 18:58:16.000000000 +0100 | ||
7 | @@ -3,11 +3,11 @@ | ||
8 | |||
9 | # Include the correct version of the UiLoader library | ||
10 | symbian: QTUITOOLS_LINKAGE = -lQtUiTools.lib | ||
11 | -else: QTUITOOLS_LINKAGE = -lQtUiTools | ||
12 | +else: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX} | ||
13 | |||
14 | CONFIG(debug, debug|release) { | ||
15 | - mac: QTUITOOLS_LINKAGE = -lQtUiTools_debug | ||
16 | - win32: QTUITOOLS_LINKAGE = -lQtUiToolsd | ||
17 | + mac: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}_debug | ||
18 | + win32: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}d | ||
19 | } | ||
20 | LIBS += $$QTUITOOLS_LINKAGE | ||
21 | |||
22 | --- /tmp/uitools.pro 2009-12-01 18:40:28.000000000 +0100 | ||
23 | +++ qt-everywhere-opensource-src-4.6.0/tools/designer/src/uitools/uitools.pro 2009-12-01 18:59:18.000000000 +0100 | ||
24 | @@ -1,5 +1,5 @@ | ||
25 | TEMPLATE = lib | ||
26 | -TARGET = $$qtLibraryTarget(QtUiTools) | ||
27 | +TARGET = QtUiTools | ||
28 | QT += xml | ||
29 | CONFIG += qt staticlib | ||
30 | DESTDIR = ../../../../lib | ||
31 | @@ -43,3 +43,5 @@ | ||
32 | QMAKE_PKGCONFIG_DESTDIR = pkgconfig | ||
33 | QMAKE_PKGCONFIG_REQUIRES += QtXml | ||
34 | } | ||
35 | + | ||
36 | +TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end | ||