From 46bdf066a442e3f8c4d3edefa8d0f8a9908361cb Mon Sep 17 00:00:00 2001 From: Yu Ke Date: Wed, 25 Aug 2010 11:12:59 +0800 Subject: 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 --- meta-lsb/packages/qt4/files/qt-config.patch | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 meta-lsb/packages/qt4/files/qt-config.patch (limited to 'meta-lsb/packages/qt4/files/qt-config.patch') 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 + +--- /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 + #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 -- cgit v1.2.3