diff options
| author |   Jeremy Lainé <jeremy.laine@m4x.org> | 2009-03-25 11:40:54 +0100 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2009-03-25 11:40:54 +0100 |
| commit | 8e64571067be19103941e6f32f08c871680b23e4 (patch) | |
| tree | 78a1e259e8b273eea01d23d83417739c26e68fef /recipes/qt4/qt4-tools-native-4.4.3/qt-config.patch | |
| parent | 5575ee4e7a2b2313ae856c93327199600ff5803a (diff) | |
| download | openembedded-8e64571067be19103941e6f32f08c871680b23e4.tar.gz | |
qt4-native: rename to qt4-tools-native
Diffstat (limited to 'recipes/qt4/qt4-tools-native-4.4.3/qt-config.patch')
| -rw-r--r-- | recipes/qt4/qt4-tools-native-4.4.3/qt-config.patch | 21 |
1 files changed, 21 insertions, 0 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 new file mode 100644 index 0000000000..3aa041aa51 --- /dev/null +++ b/recipes/qt4/qt4-tools-native-4.4.3/qt-config.patch @@ -0,0 +1,21 @@ +--- /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 |