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/qt-config.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/qt-config.patch')
| -rw-r--r-- | meta-lsb/packages/qt4/files/qt-config.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/meta-lsb/packages/qt4/files/qt-config.patch b/meta-lsb/packages/qt4/files/qt-config.patch new file mode 100644 index 0000000000..a31e7b3e2a --- /dev/null +++ b/meta-lsb/packages/qt4/files/qt-config.patch @@ -0,0 +1,24 @@ + +Ported from OE by: Yu Ke <ke.yu@intel.com> + +--- /tmp/qlibraryinfo.cpp 2008-08-02 17:16:41.000000000 +0200 ++++ qt-embedded-linux-opensource-src-4.4.1/src/corelib/global/qlibraryinfo.cpp 2008-08-02 17:17:42.000000000 +0200 +@@ -47,6 +47,7 @@ + QT_BEGIN_NAMESPACE + extern QString qmake_libraryInfoFile(); + QT_END_NAMESPACE ++#include <stdlib.h> + #else + # include "qcoreapplication.h" + #endif +@@ -113,6 +114,10 @@ + #ifdef QT_BUILD_QMAKE + if(!QFile::exists(qtconfig)) + qtconfig = qmake_libraryInfoFile(); ++ if (!QFile::exists(qtconfig)) { ++ QByteArray config = getenv("QT_CONF_PATH"); ++ qtconfig = QFile::decodeName(config); ++ } + #else + if (!QFile::exists(qtconfig) && QCoreApplication::instance()) { + #ifdef Q_OS_MAC |