Use compile check instead of searching header for ICU

The findFile would need to look though all include
paths the compiler is supporting, which can be very hard
to support for multiply compilers. It is way easier to
use a compile check to catch all include paths the
compiler supports. This fix is needed to find correctly
ICU under QNX.

Task-number: QTBUG-34743
Change-Id: I4f755042a76882b304b058355cf54e37b25df61d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

2 files changed, 15 insertions, 3 deletions

diff --git a/config.tests/unix/icu/icu.pro b/config.tests/unix/icu/icu.pro
index 002c4840d5..2c1b431f92 100644
--- a/config.tests/unix/icu/icu.pro
+++ b/config.tests/unix/icu/icu.pro
@@ -1,4 +1,16 @@
 SOURCES = icu.cpp
+CONFIG += console
 CONFIG -= qt dylib
-unix:LIBS += -licuuc -licui18n
-win32:LIBS += -licuin
+win32 {
+    CONFIG(static, static|shared) {
+        CONFIG(debug, debug|release) {
+            LIBS += -lsicuind -lsicuucd -lsicudtd
+        } else {
+            LIBS += -lsicuin -lsicuuc -lsicudt
+        }
+    } else {
+        LIBS += -licuin -licuuc
+    }
+} else {
+    LIBS += -licui18n -licuuc
+}
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 62a39cdfd5..ff7d8d93bc 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2098,7 +2098,7 @@ bool Configure::checkAvailability(const QString &part)
         available = findFile("pcre.h");
 
     else if (part == "ICU")
-        available = findFile("unicode/utypes.h") && findFile("unicode/ucol.h") && findFile("unicode/ustring.h");
+        available = tryCompileProject("unix/icu");
 
     else if (part == "ANGLE") {
         available = checkAngleAvailability();