From fba63ed00f92f939529bd1fd1f47a8d715f8bea8 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 16 Feb 2010 10:47:02 +0100 Subject: 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 --- recipes/qt4/files/qt-config.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes/qt4/files/qt-config.patch') 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()) { -- cgit v1.2.3