From 9c999dcc63e67031c5e5c12b513970f58c89f308 Mon Sep 17 00:00:00 2001 From: Andreas Holzammer Date: Mon, 11 Nov 2013 16:49:31 +0100 Subject: 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 Reviewed-by: Oswald Buddenhagen --- tools/configure/configureapp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') 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(); -- cgit v1.2.3