diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2009-03-26 17:20:30 +0100 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2009-03-26 17:20:30 +0100 |
| commit | 27c22a41fd5ab78cc2b55ac62a2510de14d31c48 (patch) | |
| tree | 5b2dec0c9687c6cd6fdfeb6178b7fdee5fe98a15 | |
| parent | 31a8edfb706e86ee9532ab16bc4b925b708371cf (diff) | |
qt4: drop obsolete patch
| -rw-r--r-- | recipes/qt4/qt4-tools-native-4.4.3/qt-config.patch | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/recipes/qt4/qt4-tools-native-4.4.3/qt-config.patch b/recipes/qt4/qt4-tools-native-4.4.3/qt-config.patch deleted file mode 100644 index 3aa041aa51..0000000000 --- a/recipes/qt4/qt4-tools-native-4.4.3/qt-config.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- /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 = config; -+ } - #else - if (!QFile::exists(qtconfig) && QCoreApplication::instance()) { - #ifdef Q_OS_MAC |