From 9fa2b641ba6ff4f4b3f474b87ddb642cfa5c3d83 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Thu, 30 Jun 2011 10:22:33 +0200
Subject: 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.

Change-Id: I449a00860c2e77e6cdd8cdcf7108621c684207bf
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index c057351e96..dbf4558c34 100755
--- a/configure
+++ b/configure
@@ -5282,7 +5282,7 @@ fi
 
 # auto-detect iconv(3) support
 if [ "$CFG_ICONV" != "no" ]; then
-    if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then
+    if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" -o "$XPLATFORM_MINGW" = "yes" ]; then
 	CFG_ICONV=no
     elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/iconv" "POSIX iconv" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
         CFG_ICONV=yes
-- 
cgit v1.2.3