File qt5-rename-icuin-lib.patch of Package mingw32-libqt5-qtbase

Overview Repositories Revisions Requests Users Attributes Meta

File qt5-rename-icuin-lib.patch of Package mingw32-libqt5-qtbase (Revision 040f3ced74e7ef1a551a171130834e1c)

Currently displaying revision 040f3ced74e7ef1a551a171130834e1c , Show latest

diff --git a/config.tests/unix/icu/icu.pro b/config.tests/unix/icu/icu.pro
index 16267ff..67b3fd6 100644
--- a/config.tests/unix/icu/icu.pro
+++ b/config.tests/unix/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 {
     LIBS += -licui18n -licuuc -licudata
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri
index 57a9591..be9468d 100644
--- a/src/corelib/tools/tools.pri
+++ b/src/corelib/tools/tools.pri
@@ -156,14 +156,18 @@ contains(QT_CONFIG,icu) {
                tools/qtimezoneprivate_icu.cpp
     DEFINES += QT_USE_ICU
     win32 {
+        ICUI18N=icuin
+        ICUDATA=icudt
+        gcc:ICUI18N=icui18n
+        gcc:ICUDATA=icudata
         CONFIG(static, static|shared) {
             CONFIG(debug, debug|release) {
-                LIBS_PRIVATE += -lsicuind -lsicuucd -lsicudtd
+                LIBS_PRIVATE += -ls$${ICUI18N}d -lsicuucd -ls$${ICUDATA}d
             } else {
-                LIBS_PRIVATE += -lsicuin -lsicuuc -lsicudt
+                LIBS_PRIVATE += -ls$${ICUI18N} -lsicuuc -ls$${ICUDATA}
             }
         } else {
-            LIBS_PRIVATE += -licuin -licuuc -licudt
+            LIBS_PRIVATE += -l$${ICUI18N} -licuuc -l$${ICUDATA}
         }
     } else {
         LIBS_PRIVATE += -licui18n -licuuc -licudata

Places

File qt5-rename-icuin-lib.patch of Package mingw32-libqt5-qtbase (Revision 040f3ced74e7ef1a551a171130834e1c)

Places