[oe-commits] Jeremy Lainé : qt4: drop obsolete patch

GIT User account git at amethyst.openembedded.net
Thu Mar 26 16:22:44 UTC 2009


Module: openembedded.git
Branch: org.openembedded.dev
Commit: 27c22a41fd5ab78cc2b55ac62a2510de14d31c48
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=27c22a41fd5ab78cc2b55ac62a2510de14d31c48

Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Thu Mar 26 17:20:30 2009 +0100

qt4: drop obsolete patch

---

 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 3aa041a..0000000
--- 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





More information about the Openembedded-commits mailing list