Auto detect iconv on Windows hosts

Enable auto detection for iconv when
cross-compiling from Windows hosts.

Change-Id: I699e0a31d938403f5e80e74be90df87f11f361ba
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index fc33922..d1f5609 100644 (file)
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -237,6 +237,7 @@ Configure::Configure(int& argc, char** argv)
     dictionary[ "FONT_CONFIG" ]     = "no";
     dictionary[ "POSIX_IPC" ]       = "no";
     dictionary[ "QT_GLIB" ]         = "no";
+    dictionary[ "QT_ICONV" ]        = "auto";
 
     //Only used when cross compiling.
     dictionary[ "QT_INSTALL_SETTINGS" ] = "/etc/xdg";
@@ -2093,6 +2094,8 @@ bool Configure::checkAvailability(const QString &part)
         available = true;
     } else if (part == "DIRECTWRITE") {
         available = findFile("dwrite.h") && findFile("d2d1.h") && findFile("dwrite.lib");
+    } else if (part == "ICONV") {
+        available = tryCompileProject("unix/iconv") || tryCompileProject("unix/gnu-libiconv");
     }
 
     return available;
@@ -2192,6 +2195,10 @@ void Configure::autoDetection()
     if (dictionary["INCREDIBUILD_XGE"] == "auto")
         dictionary["INCREDIBUILD_XGE"] = checkAvailability("INCREDIBUILD_XGE") ? "yes" : "no";
 
+    // Detection of iconv support
+    if (dictionary["QT_ICONV"] == "auto")
+        dictionary["QT_ICONV"] = checkAvailability("ICONV") ? "yes" : "no";
+
     // Mark all unknown "auto" to the default value..
     for (QMap<QString,QString>::iterator i = dictionary.begin(); i != dictionary.end(); ++i) {
         if (i.value() == "auto")