File qt5-qtwebkit-use-correct-icu-libs.patch of Package mingw32-libqt5-qtwebkit
diff --git a/Source/WTF/WTF.pri b/Source/WTF/WTF.pri
index 696e496..2da217d 100644
--- a/Source/WTF/WTF.pri
+++ b/Source/WTF/WTF.pri
@@ -14,7 +14,8 @@ mac {
INCLUDEPATH = $${ROOT_WEBKIT_DIR}/Source/WTF/icu $$INCLUDEPATH
LIBS += -licucore
} else:!use?(wchar_unicode): {
- win32: LIBS += -licuin -licuuc -licudt
+ win32:gcc: LIBS += -licui18n -licuuc -licudata
+ 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
diff --git a/Tools/qmake/config.tests/icu/icu.pro b/Tools/qmake/config.tests/icu/icu.pro
index 0486c53..cc8af68 100644
--- a/Tools/qmake/config.tests/icu/icu.pro
+++ b/Tools/qmake/config.tests/icu/icu.pro
@@ -3,14 +3,18 @@ CONFIG += console
CONFIG -= qt dylib
win32 {
+ ICUI18N=icuin
+ ICUDATA=icudt
+ gcc:ICUI18N=icui18n
+ gcc:ICUDATA=icudata
CONFIG(static, static|shared) {
CONFIG(debug, debug|release) {
- LIBS += -lsicuind -lsicuucd -lsicudtd
+ LIBS += -ls$${ICUI18N}d -lsicuucd -ls$${ICUDATA}d
} else {
- LIBS += -lsicuin -lsicuuc -lsicudt
+ LIBS += -ls$${ICUI18N} -lsicuuc -ls$${ICUDATA}
}
} else {
- LIBS += -licuin -licuuc -licudt
+ LIBS += -l$${ICUI18N} -licuuc -l$${ICUDATA}
}
} else:!contains(QT_CONFIG,no-pkg-config):packagesExist("icu-i18n") {
PKGCONFIG += icu-i18n