summaryrefslogtreecommitdiffstats
path: root/meta-lsb/packages/qt4/files/qt-config.patch
diff options
context:
space:
mode:
authorYu Ke <ke.yu@intel.com>2010-08-25 11:12:59 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-27 13:29:51 +0100
commit46bdf066a442e3f8c4d3edefa8d0f8a9908361cb (patch)
tree10fe121935b1718d36212dd9da9ffb181573e96a /meta-lsb/packages/qt4/files/qt-config.patch
parent51e05bbe6c4c78a59114a9197dfd0457506d089c (diff)
downloadpoky-46bdf066a442e3f8c4d3edefa8d0f8a9908361cb.tar.gz
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.patch24
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 @@
1
2Ported from OE by: Yu Ke <ke.yu@intel.com>
3
4--- /tmp/qlibraryinfo.cpp 2008-08-02 17:16:41.000000000 +0200
5+++ qt-embedded-linux-opensource-src-4.4.1/src/corelib/global/qlibraryinfo.cpp 2008-08-02 17:17:42.000000000 +0200
6@@ -47,6 +47,7 @@
7 QT_BEGIN_NAMESPACE
8 extern QString qmake_libraryInfoFile();
9 QT_END_NAMESPACE
10+#include <stdlib.h>
11 #else
12 # include "qcoreapplication.h"
13 #endif
14@@ -113,6 +114,10 @@
15 #ifdef QT_BUILD_QMAKE
16 if(!QFile::exists(qtconfig))
17 qtconfig = qmake_libraryInfoFile();
18+ if (!QFile::exists(qtconfig)) {
19+ QByteArray config = getenv("QT_CONF_PATH");
20+ qtconfig = QFile::decodeName(config);
21+ }
22 #else
23 if (!QFile::exists(qtconfig) && QCoreApplication::instance()) {
24 #ifdef Q_OS_MAC