diff options
Diffstat (limited to 'meta-oe/recipes-qt/qt4/files/qt-config.patch')
| -rw-r--r-- | meta-oe/recipes-qt/qt4/files/qt-config.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/meta-oe/recipes-qt/qt4/files/qt-config.patch b/meta-oe/recipes-qt/qt4/files/qt-config.patch new file mode 100644 index 0000000000..a31e7b3e2a --- /dev/null +++ b/meta-oe/recipes-qt/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 |