diff options
| author |   Koen Kooi <koen@openembedded.org> | 2010-02-16 10:47:02 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2010-02-17 09:43:47 +0100 |
| commit | fba63ed00f92f939529bd1fd1f47a8d715f8bea8 (patch) | |
| tree | 113450dc1c92b51d66e0e8c391476ebefbb90ade /recipes/qt4/files | |
| parent | 7194635729b20c15d41a08c89a30a5a8aabbc090 (diff) | |
| download | openembedded-fba63ed00f92f939529bd1fd1f47a8d715f8bea8.tar.gz | |
qt4: add 4.6.2
* fix 4.6.1 references in 4.6.0 files as well
* make qt-config.patch work with QT_NO_CAST_{TO,FROM},ASCII strict checking
Diffstat (limited to 'recipes/qt4/files')
| -rw-r--r-- | recipes/qt4/files/qt-config.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes/qt4/files/qt-config.patch b/recipes/qt4/files/qt-config.patch index 3aa041aa51..a4a701ccd7 100644 --- a/recipes/qt4/files/qt-config.patch +++ b/recipes/qt4/files/qt-config.patch @@ -14,7 +14,7 @@ qtconfig = qmake_libraryInfoFile(); + if (!QFile::exists(qtconfig)) { + QByteArray config = getenv("QT_CONF_PATH"); -+ qtconfig = config; ++ qtconfig = QFile::decodeName(config); + } #else if (!QFile::exists(qtconfig) && QCoreApplication::instance()) { |