diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2012-09-26 11:05:45 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-27 06:07:23 +0200 |
| commit | fb46b00eef0de80f05cb21b719057bacf059dbbf (patch) | |
| tree | 81a7919dd305252f9b25191bdc8c7e0454467f6e /tools/configure/configureapp.cpp | |
| parent | 8e991d04612eb1c39e665f42a3a0eb87b8070757 (diff) | |
Configure.exe: Fix auto-detection of ICU for MinGW
If one compiles ICU with MinGW the .lib files also have a lib prefix.
Take this into account when checking for ICU availability.
Upstream bug report: http://bugs.icu-project.org/trac/ticket/9603
Change-Id: Ia1ca49053b0ab41de45eec13799d94d5e934c42e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'tools/configure/configureapp.cpp')
| -rw-r--r-- | tools/configure/configureapp.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index fb8ccdb99c..85002e3a66 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1968,7 +1968,8 @@ 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"); + available = findFile("unicode/utypes.h") && findFile("unicode/ucol.h") && findFile("unicode/ustring.h") + && (findFile("icuin.lib") || findFile("libicuin.lib")); // libicun.lib if compiled with mingw else if (part == "LIBJPEG") available = findFile("jpeglib.h"); |