diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-09-26 20:13:11 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-02 17:19:16 +0100 |
| commit | 8cc54d2d154b2ed9f931da39d75dc9c135f5e26d (patch) | |
| tree | 359426519f01010b1e6dfec43c0826cf88038f01 /meta/recipes-qt/qt4/qt4-4.8.1/0008-qt-lib-infix.patch | |
| parent | 8dccc55a623f0c5f3469c7cdf63aa788683aa186 (diff) | |
| download | openembedded-core-8cc54d2d154b2ed9f931da39d75dc9c135f5e26d.tar.gz openembedded-core-8cc54d2d154b2ed9f931da39d75dc9c135f5e26d.tar.bz2 openembedded-core-8cc54d2d154b2ed9f931da39d75dc9c135f5e26d.zip | |
qt4: move patches from files to qt4-4.8.1
* faster lookup in FILESPATH as small bonus
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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.patch | 41 |
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 @@ +Add lib infix for QtUiTools to distinguish different Qt edition: e.g. "E" for embedded, "" for X11 + +Patch has been accepted upstream and should be included in the next major version (4.8.0), see: +http://bugreports.qt.nokia.com/browse/QTBUG-7169 + +Original Author: Jeremy Lainé <jeremy.laine@m4x.org> +Ported from OE by: Yu Ke <ke.yu@intel.com> +Upstream-Status: Accepted + +--- /tmp/uitools.prf 2009-12-01 18:38:22.000000000 +0100 ++++ qt-everywhere-opensource-src-4.6.0/mkspecs/features/uitools.prf 2009-12-01 18:58:16.000000000 +0100 +@@ -3,11 +3,11 @@ + + # Include the correct version of the UiLoader library + symbian: QTUITOOLS_LINKAGE = -lQtUiTools.lib +-else: QTUITOOLS_LINKAGE = -lQtUiTools ++else: 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 + +--- /tmp/uitools.pro 2009-12-01 18:40:28.000000000 +0100 ++++ qt-everywhere-opensource-src-4.6.0/tools/designer/src/uitools/uitools.pro 2009-12-01 18:59:18.000000000 +0100 +@@ -1,5 +1,5 @@ + TEMPLATE = lib +-TARGET = $$qtLibraryTarget(QtUiTools) ++TARGET = QtUiTools + QT += xml + CONFIG += qt staticlib + DESTDIR = ../../../../lib +@@ -43,3 +43,5 @@ + QMAKE_PKGCONFIG_DESTDIR = pkgconfig + QMAKE_PKGCONFIG_REQUIRES += QtXml + } ++ ++TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end |