diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2011-01-03 11:03:36 +0100 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-01-03 12:04:28 +0100 |
commit | 1ec312f314343f287956dcab5482571039a94ff1 (patch) | |
tree | 604453191dd176e0b53f42eb538be017496235b7 /recipes-qt/qt4/qt4-embedded-4.6.3/0008-qt-lib-infix.patch | |
parent | 63057a32d7b877c39b85eb3e9168c6fd7e4ce579 (diff) | |
download | meta-openembedded-contrib-1ec312f314343f287956dcab5482571039a94ff1.tar.gz |
qt4: import files from OE
This gives us both qt4-x11 and qt4-embedded; qt4-x11 was already present in yocto, but was lacking features
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'recipes-qt/qt4/qt4-embedded-4.6.3/0008-qt-lib-infix.patch')
-rw-r--r-- | recipes-qt/qt4/qt4-embedded-4.6.3/0008-qt-lib-infix.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/recipes-qt/qt4/qt4-embedded-4.6.3/0008-qt-lib-infix.patch b/recipes-qt/qt4/qt4-embedded-4.6.3/0008-qt-lib-infix.patch new file mode 100644 index 0000000000..61e60a0eb6 --- /dev/null +++ b/recipes-qt/qt4/qt4-embedded-4.6.3/0008-qt-lib-infix.patch @@ -0,0 +1,32 @@ +--- /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 |