File qt5-qtwebkit-use-correct-icu-libs.patch of Package mingw64-libqt5-qtwebkit

Overview Repositories Revisions Requests Users Attributes Meta

File qt5-qtwebkit-use-correct-icu-libs.patch of Package mingw64-libqt5-qtwebkit (Revision aab0e0790a52992f1b0b36c1f21c1441)

Currently displaying revision aab0e0790a52992f1b0b36c1f21c1441 , Show latest

diff --git a/Source/WTF/WTF.pri b/Source/WTF/WTF.pri
index b4f7765..06de235 100644
--- a/Source/WTF/WTF.pri
+++ b/Source/WTF/WTF.pri
@@ -15,14 +15,18 @@ mac {
     LIBS += -licucore
 } else:!use?(wchar_unicode): {
     win32 {
+        ICUI18N=icuin
+        ICUDATA=icudt
+        gcc:ICUI18N=icui18n
+        gcc:ICUDATA=icudata
         CONFIG(static, static|shared) {
             CONFIG(debug, debug|release) {
-                LIBS += -lsicuind -lsicuucd -lsicudtd
+                LIBS += -l$${ICUI18N}d -licuucd -l$${ICUDATA}d
             } else {
-                LIBS += -lsicuin -lsicuuc -lsicudt
+                LIBS += -l$${ICUI18N} -lsicuuc -l$${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
diff --git a/Tools/qmake/config.tests/icu/icu.pro b/Tools/qmake/config.tests/icu/icu.pro
index ce3780a..2f36b62 100644
--- a/Tools/qmake/config.tests/icu/icu.pro
+++ b/Tools/qmake/config.tests/icu/icu.pro
@@ -3,15 +3,19 @@ CONFIG += console
 CONFIG -= qt dylib
 
 win32 {
+    ICUI18N=icuin
+    ICUDATA=icudt
+    gcc:ICUI18N=icui18n
+    gcc:ICUDATA=icudata
     CONFIG(static, static|shared) {
         LIBS += $$QMAKE_LIBS_CORE
         CONFIG(debug, debug|release) {
-            LIBS += -lsicuind -lsicuucd -lsicudtd
+            LIBS += -l$${ICUI18N}d -licuucd -l$${ICUDATA}d
         } else {
-            LIBS += -lsicuin -lsicuuc -lsicudt
+            LIBS += -l$${ICUI18N} -licuuc -l$${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

Places

File qt5-qtwebkit-use-correct-icu-libs.patch of Package mingw64-libqt5-qtwebkit (Revision aab0e0790a52992f1b0b36c1f21c1441)

Places