diff options
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.1/qt-config.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.1/qt-config.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/qt-config.patch b/meta/recipes-qt/qt4/qt4-4.8.1/qt-config.patch deleted file mode 100644 index 2ab05ed1ad..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.1/qt-config.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 - -Original Author: Holger Freyther <zecke@selfish.org> -Ported from OE by: Yu Ke <ke.yu@intel.com> -Upstream-Status: Pending - ---- /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 = QFile::decodeName(config); -+ } - #else - if (!QFile::exists(qtconfig) && QCoreApplication::instance()) { - #ifdef Q_OS_MAC |