level Qt up to version 5.7.0 + several bug fixes

[feed/video.git] / frameworks / qt5base / patches / 011-use-posix-iconv.patch

diff --git a/frameworks/qt5base/patches/011-use-posix-iconv.patch b/frameworks/qt5base/patches/011-use-posix-iconv.patch
index 23e4f85f2e68d5942fc5bde76f3e3164dfda837f..f58b06f4fd8071610608d016d1f1043554dc39ab 100644 (file)
--- a/frameworks/qt5base/patches/011-use-posix-iconv.patch
+++ b/frameworks/qt5base/patches/011-use-posix-iconv.patch
@@ -1,17 +1,6 @@
 --- a/config.tests/unix/iconv/iconv.pro
 +++ b/config.tests/unix/iconv/iconv.pro
-@@ -1,3 +1,3 @@
- SOURCES = iconv.cpp
- CONFIG -= qt dylib
--mac|mingw|qnx:LIBS += -liconv
-+mac|mingw|qnx|linux:LIBS += -liconv
---- a/src/corelib/codecs/codecs.pri
-+++ b/src/corelib/codecs/codecs.pri
-@@ -44,6 +44,7 @@ contains(QT_CONFIG,icu) {
-             contains(QT_CONFIG,iconv) {
-                     HEADERS += codecs/qiconvcodec_p.h
-                     SOURCES += codecs/qiconvcodec.cpp
-+                    LIBS_PRIVATE *= -liconv
-             } else:contains(QT_CONFIG,gnu-libiconv) {
-                     HEADERS += codecs/qiconvcodec_p.h
-                     SOURCES += codecs/qiconvcodec.cpp
+@@ -1,2 +1,2 @@
+ CONFIG -= qt dylib       
+-mac|mingw|qnx|haiku:LIBS += -liconv
++mac|mingw|qnx|haiku|linux:LIBS += -liconv