diff options
Diffstat (limited to 'meta-oe/recipes-qt/qt4/qt4-x11-free/0008-qt-lib-infix.patch')
| -rw-r--r-- | meta-oe/recipes-qt/qt4/qt4-x11-free/0008-qt-lib-infix.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/meta-oe/recipes-qt/qt4/qt4-x11-free/0008-qt-lib-infix.patch b/meta-oe/recipes-qt/qt4/qt4-x11-free/0008-qt-lib-infix.patch deleted file mode 100644 index 3efaff37d3..0000000000 --- a/meta-oe/recipes-qt/qt4/qt4-x11-free/0008-qt-lib-infix.patch +++ /dev/null | |||
| @@ -1,34 +0,0 @@ | |||
| 1 | Index: qt-embedded-linux-opensource-src-4.5.0/mkspecs/features/uitools.prf | ||
| 2 | =================================================================== | ||
| 3 | --- qt-embedded-linux-opensource-src-4.5.0.orig/mkspecs/features/uitools.prf 2009-02-25 22:32:34.000000000 +0100 | ||
| 4 | +++ qt-embedded-linux-opensource-src-4.5.0/mkspecs/features/uitools.prf 2009-03-26 17:17:27.000000000 +0100 | ||
| 5 | @@ -2,10 +2,10 @@ | ||
| 6 | qt:load(qt) | ||
| 7 | |||
| 8 | # Include the correct version of the UiLoader library | ||
| 9 | -QTUITOOLS_LINKAGE = -lQtUiTools | ||
| 10 | +QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX} | ||
| 11 | CONFIG(debug, debug|release) { | ||
| 12 | - mac: QTUITOOLS_LINKAGE = -lQtUiTools_debug | ||
| 13 | - win32: QTUITOOLS_LINKAGE = -lQtUiToolsd | ||
| 14 | + mac: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}_debug | ||
| 15 | + win32: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}d | ||
| 16 | } | ||
| 17 | LIBS += $$QTUITOOLS_LINKAGE | ||
| 18 | |||
| 19 | Index: qt-embedded-linux-opensource-src-4.5.0/tools/designer/src/uitools/uitools.pro | ||
| 20 | =================================================================== | ||
| 21 | --- qt-embedded-linux-opensource-src-4.5.0.orig/tools/designer/src/uitools/uitools.pro 2009-02-25 22:32:42.000000000 +0100 | ||
| 22 | +++ qt-embedded-linux-opensource-src-4.5.0/tools/designer/src/uitools/uitools.pro 2009-03-26 17:17:27.000000000 +0100 | ||
| 23 | @@ -1,5 +1,5 @@ | ||
| 24 | TEMPLATE = lib | ||
| 25 | -TARGET = $$qtLibraryTarget(QtUiTools) | ||
| 26 | +TARGET = QtUiTools | ||
| 27 | QT += xml | ||
| 28 | CONFIG += qt staticlib | ||
| 29 | DESTDIR = ../../../../lib | ||
| 30 | @@ -39,3 +39,4 @@ | ||
| 31 | QMAKE_PKGCONFIG_REQUIRES += QtXml | ||
| 32 | } | ||
| 33 | |||
| 34 | +TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end | ||
