From: Jeremy Lainé Date: Thu, 26 Mar 2009 16:20:30 +0000 (+0100) Subject: qt4: drop obsolete patch X-Git-Tag: Release-2010-05/1~3796^2~34 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27c22a41fd5ab78cc2b55ac62a2510de14d31c48;p=openembedded.git qt4: drop obsolete patch --- 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 - #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