1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix check for ICU on MinGW

Browse Source 
Newer ICU versions do not generate a .lib file any more ...
Also the check doesn't take e.g. static debug builds into account.
Instead of trying to enumerate all possible variations, just rely on the
header check. That's what we're doing for the other libs, too.

Change-Id: Idc0527f0e8ad90f298337d4ab635c7aa6a35c351
Reviewed-by: Jonathan Liu <net147@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Kai Koehne 2013-10-24 13:15:17 +02:00 committed by The Qt Project
parent e658f70b85
commit c584f3d9a8
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/configure/configureapp.cpp
View File

@ -2103,9 +2103,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")
&& (findFile("icuin.lib") || findFile("sicuin.lib")
|| findFile("libicuin.lib") || findFile("libsicuin.lib")); // "lib" prefix for mingw, 's' prefix for static
available = findFile("unicode/utypes.h") && findFile("unicode/ucol.h") && findFile("unicode/ustring.h");
else if (part == "ANGLE") {
available = checkAngleAvailability();