summaryrefslogtreecommitdiffstats
path: root/tools/configure
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2013-03-08 11:24:36 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-12 09:07:38 +0100
commit124da59cb40df5e47e7183dfef90bcd5957ed71f (patch)
tree06ef82ab953bc5d128c35779bca79cfc2eddca7e /tools/configure
parenta12f6ba302e54c1570c54aa4c722f2dafbf794af (diff)
Fix static builds with ICU
Make sure we actually link against the static version of the ICU libs for static builds. Task-number: QTBUG-29478 Change-Id: Ida7b439f11c5393bee43bfe804f9ec84bf272b34 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tools/configure')
-rw-r--r--tools/configure/configureapp.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index af470939e9..d19d34e54e 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2017,7 +2017,8 @@ bool Configure::checkAvailability(const QString &part)
else if (part == "ICU")
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
+ && (findFile("icuin.lib") || findFile("sicuin.lib")
+ || findFile("libicuin.lib") || findFile("libsicuin.lib")); // "lib" prefix for mingw, 's' prefix for static
else if (part == "ANGLE") {
available = checkAngleAvailability();