diff options
| author | Koen Kooi <koen@openembedded.org> | 2008-08-02 16:57:39 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-08-02 16:57:39 +0000 |
| commit | ce9aade2160f6c3f0a19e1c370626a44ca62fec2 (patch) | |
| tree | 86e3b17f35f664ce2427eada9ff2483979154be3 /packages/qmake/files/qt-config.patch | |
| parent | 73a904e7583df04f08458005afe462b60f8c006e (diff) | |
qmake2 native: update to 4.4.1 and fix builds from scratch
Diffstat (limited to 'packages/qmake/files/qt-config.patch')
| -rw-r--r-- | packages/qmake/files/qt-config.patch | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/packages/qmake/files/qt-config.patch b/packages/qmake/files/qt-config.patch index b2d86de2c5..3aa041aa51 100644 --- a/packages/qmake/files/qt-config.patch +++ b/packages/qmake/files/qt-config.patch @@ -1,20 +1,14 @@ -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 +--- /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 -@@ -107,6 +108,10 @@ +@@ -113,6 +114,10 @@ #ifdef QT_BUILD_QMAKE if(!QFile::exists(qtconfig)) qtconfig = qmake_libraryInfoFile(); |