diff options
Diffstat (limited to 'meta-lsb/packages/qt4/files/qt-config.patch')
-rw-r--r-- | meta-lsb/packages/qt4/files/qt-config.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/meta-lsb/packages/qt4/files/qt-config.patch b/meta-lsb/packages/qt4/files/qt-config.patch deleted file mode 100644 index a31e7b3e2a..0000000000 --- a/meta-lsb/packages/qt4/files/qt-config.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | |||
2 | Ported from OE by: Yu Ke <ke.yu@intel.com> | ||
3 | |||
4 | --- /tmp/qlibraryinfo.cpp 2008-08-02 17:16:41.000000000 +0200 | ||
5 | +++ qt-embedded-linux-opensource-src-4.4.1/src/corelib/global/qlibraryinfo.cpp 2008-08-02 17:17:42.000000000 +0200 | ||
6 | @@ -47,6 +47,7 @@ | ||
7 | QT_BEGIN_NAMESPACE | ||
8 | extern QString qmake_libraryInfoFile(); | ||
9 | QT_END_NAMESPACE | ||
10 | +#include <stdlib.h> | ||
11 | #else | ||
12 | # include "qcoreapplication.h" | ||
13 | #endif | ||
14 | @@ -113,6 +114,10 @@ | ||
15 | #ifdef QT_BUILD_QMAKE | ||
16 | if(!QFile::exists(qtconfig)) | ||
17 | qtconfig = qmake_libraryInfoFile(); | ||
18 | + if (!QFile::exists(qtconfig)) { | ||
19 | + QByteArray config = getenv("QT_CONF_PATH"); | ||
20 | + qtconfig = QFile::decodeName(config); | ||
21 | + } | ||
22 | #else | ||
23 | if (!QFile::exists(qtconfig) && QCoreApplication::instance()) { | ||
24 | #ifdef Q_OS_MAC | ||