diff options
Diffstat (limited to '0026-Enable-and-fix-use-of-iconv.patch')
| -rw-r--r-- | 0026-Enable-and-fix-use-of-iconv.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/0026-Enable-and-fix-use-of-iconv.patch b/0026-Enable-and-fix-use-of-iconv.patch index 470a8cbe466a..2bf44dfba747 100644 --- a/0026-Enable-and-fix-use-of-iconv.patch +++ b/0026-Enable-and-fix-use-of-iconv.patch @@ -1,7 +1,7 @@ -From fe813fad22868934acf9f628d28eb9ebc8f1b944 Mon Sep 17 00:00:00 2001 +From 5f1d71631402760aa75df7b0ea8c9be7608f51a2 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Wed, 25 Jan 2017 21:08:20 +0100 -Subject: [PATCH 26/31] Enable and fix use of iconv +Subject: [PATCH 26/32] Enable and fix use of iconv Change-Id: I5f0ab27afca0800dec11c7af74d196190820ae5c --- @@ -10,7 +10,7 @@ Change-Id: I5f0ab27afca0800dec11c7af74d196190820ae5c 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/corelib/codecs/qiconvcodec.cpp b/src/corelib/codecs/qiconvcodec.cpp -index 9c39727946..cc14036b25 100644 +index 9c39727946c..cc14036b254 100644 --- a/src/corelib/codecs/qiconvcodec.cpp +++ b/src/corelib/codecs/qiconvcodec.cpp @@ -47,7 +47,6 @@ @@ -49,7 +49,7 @@ index 9c39727946..cc14036b25 100644 #else char **inBytesPtr = &inBytes; diff --git a/src/corelib/configure.json b/src/corelib/configure.json -index ae360239c6..5fd57a1a66 100644 +index a9025a2dd29..ffb6f50fbe1 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json @@ -72,7 +72,7 @@ @@ -61,7 +61,7 @@ index ae360239c6..5fd57a1a66 100644 "char *outp;", "size_t inbytes, outbytes;", "iconv(x, &inp, &inbytes, &outp, &outbytes);", -@@ -672,9 +672,9 @@ +@@ -673,9 +673,9 @@ }, "gnu-libiconv": { "label": "GNU iconv", @@ -74,5 +74,5 @@ index ae360239c6..5fd57a1a66 100644 }, "icu": { -- -2.25.0 +2.44.0 |