Skip to content
This repository was archived by the owner on Jan 2, 2023. It is now read-only.

Commit 735bb77

Browse files
mabrandashkulz
authored andcommitted
do not detect or configure iconv for Windows
Qt doesn't use iconv on Windows, but configuring it will appear to work and the build will complete. The result is that character set conversions do not work. Configure.exe already disables iconv for Windows. backported from qt5/qtbase Change-Id: I449a00860c2e77e6cdd8cdcf7108621c684207bf Reviewed-by: Lars Knoll <[email protected]> Reviewed-by: Friedemann Kleint <[email protected]> (cherry picked from commit 9fa2b641ba6ff4f4b3f474b87ddb642cfa5c3d83)
1 parent bf834a5 commit 735bb77

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5831,7 +5831,7 @@ fi
58315831

58325832
# auto-detect iconv(3) support
58335833
if [ "$CFG_ICONV" != "no" ]; then
5834-
if [ "$PLATFORM_QWS" = "yes" ] || [ "$PLATFORM_QPA" = "yes" -a "$CFG_ICONV" = "auto" ]; then
5834+
if [ "$PLATFORM_QWS" = "yes" -o "$XPLATFORM_MINGW" = "yes" ] || [ "$PLATFORM_QPA" = "yes" -a "$CFG_ICONV" = "auto" ]; then
58355835
CFG_ICONV=no
58365836
elif compileTest "unix/iconv" "POSIX iconv"; then
58375837
CFG_ICONV=yes

0 commit comments

Comments
 (0)