diff options
| author | Ashish Kulkarni <kulkarni.ashish@gmail.com> | 2014-12-17 18:13:20 +0530 |
|---|---|---|
| committer | Ashish Kulkarni <kulkarni.ashish@gmail.com> | 2015-01-08 17:51:23 +0100 |
| commit | fe1706e797033af0411ce0db793f51c90078d21e (patch) | |
| tree | 6bf243a264d2bbaa9b78f51b7562d4b9ac8fdf70 | |
| parent | bf0c6b764cd79301226f481dc8bc98c4d85995fe (diff) | |
WTF: fix build on Windows for static ICU
The logic used was changed to be in sync with that used
for the configuration tests.
Change-Id: I8ba654c85487c19144431a94c2337caebac60447
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| -rw-r--r-- | Source/WTF/WTF.pri | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Source/WTF/WTF.pri b/Source/WTF/WTF.pri index 696e4962e..bb130f6a4 100644 --- a/Source/WTF/WTF.pri +++ b/Source/WTF/WTF.pri @@ -14,7 +14,17 @@ mac { INCLUDEPATH = $${ROOT_WEBKIT_DIR}/Source/WTF/icu $$INCLUDEPATH LIBS += -licucore } else:!use?(wchar_unicode): { - win32: LIBS += -licuin -licuuc -licudt + win32 { + CONFIG(static, static|shared) { + CONFIG(debug, debug|release) { + LIBS += -lsicuind -lsicuucd -lsicudtd + } else { + LIBS += -lsicuin -lsicuuc -lsicudt + } + } else { + LIBS += -licuin -licuuc -licudt + } + } else:!contains(QT_CONFIG,no-pkg-config):packagesExist("icu-i18n"): PKGCONFIG *= icu-i18n else:android: LIBS += -licui18n -licuuc else: LIBS += -licui18n -licuuc -licudata |