diff options
| author | Yu Ke <ke.yu@intel.com> | 2010-08-25 11:12:59 +0800 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-27 13:29:51 +0100 |
| commit | 46bdf066a442e3f8c4d3edefa8d0f8a9908361cb (patch) | |
| tree | 10fe121935b1718d36212dd9da9ffb181573e96a /meta-lsb/packages/qt4/files/0008-qt-lib-infix.patch | |
| parent | 51e05bbe6c4c78a59114a9197dfd0457506d089c (diff) | |
| download | openembedded-core-46bdf066a442e3f8c4d3edefa8d0f8a9908361cb.tar.gz openembedded-core-46bdf066a442e3f8c4d3edefa8d0f8a9908361cb.tar.bz2 openembedded-core-46bdf066a442e3f8c4d3edefa8d0f8a9908361cb.zip | |
qt4 core lib: add qt4 core library x11 version.
QT is a comprehensive cross-platform C++ application framework. this commit add QT4 library compiled with X11 options.
The code is ported from OE version, with following changes:
- remove the obsolate configure options, e.g. -embedded, -qdbus, etc
- remove the poky unsupported configuree option, e.g. mysql, postgresql etc
- revise the arch detection func, to support powerpc, x86_64
- other format cleanup
Signed-off-by: Yu Ke <ke.yu@intel.com>
Diffstat (limited to 'meta-lsb/packages/qt4/files/0008-qt-lib-infix.patch')
| -rw-r--r-- | meta-lsb/packages/qt4/files/0008-qt-lib-infix.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/meta-lsb/packages/qt4/files/0008-qt-lib-infix.patch b/meta-lsb/packages/qt4/files/0008-qt-lib-infix.patch new file mode 100644 index 0000000000..a1b89124dd --- /dev/null +++ b/meta-lsb/packages/qt4/files/0008-qt-lib-infix.patch @@ -0,0 +1,36 @@ +Add lib infix to distinguish different qt compile version: e.g. "E" for embedded, "" for X11 + +Ported from OE by: Yu Ke <ke.yu@intel.com> + +--- /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 |