diff options
| author | Koen Kooi <koen@openembedded.org> | 2008-07-14 08:33:53 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-07-14 08:33:53 +0000 |
| commit | 1b0cbb809e09eddff243e874edff54a4b0c25626 (patch) | |
| tree | 06e1a57f3b7c6b9dd4065c09a966fac516166f43 /packages/qmake/files/qt-config.patch | |
| parent | 8d5f83863769892c6bb9e9cadd570ab596e8dd07 (diff) | |
qmake2: add sdk version
Diffstat (limited to 'packages/qmake/files/qt-config.patch')
| -rw-r--r-- | packages/qmake/files/qt-config.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/packages/qmake/files/qt-config.patch b/packages/qmake/files/qt-config.patch new file mode 100644 index 0000000000..b2d86de2c5 --- /dev/null +++ b/packages/qmake/files/qt-config.patch @@ -0,0 +1,27 @@ +Allow to set a qt.conf from the outside using the environment. This allows +to inject new prefixes and other paths into qmake. This is needed when using +the same qmake binary to build qt/x11 and qt/embedded + +Index: qtopia-core-opensource-src-4.3.3/src/corelib/global/qlibraryinfo.cpp +=================================================================== +--- qtopia-core-opensource-src-4.3.3.orig/src/corelib/global/qlibraryinfo.cpp 2007-12-25 00:55:32.000000000 +0100 ++++ qtopia-core-opensource-src-4.3.3/src/corelib/global/qlibraryinfo.cpp 2007-12-25 01:20:18.000000000 +0100 +@@ -42,6 +42,7 @@ + #include "qpointer.h" + #ifdef QT_BUILD_QMAKE + extern QString qmake_libraryInfoFile(); ++#include <stdlib.h> + #else + # include "qcoreapplication.h" + #endif +@@ -107,6 +108,10 @@ + #ifdef QT_BUILD_QMAKE + if(!QFile::exists(qtconfig)) + qtconfig = qmake_libraryInfoFile(); ++ if (!QFile::exists(qtconfig)) { ++ QByteArray config = getenv("QT_CONF_PATH"); ++ qtconfig = config; ++ } + #else + if (!QFile::exists(qtconfig) && QCoreApplication::instance()) { + #ifdef Q_OS_MAC |