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