File 0001-Fix-finding-icu-on-mingw64-cross-compile.p... of Package mingw64-libqt5-qtbase

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Fix-finding-icu-on-mingw64-cross-compile.patch of Package mingw64-libqt5-qtbase (Revision 6ce4f59f1b1e420614e9ac09b0c8fd1a)

Currently displaying revision 6ce4f59f1b1e420614e9ac09b0c8fd1a , Show latest

From 3ca5d30080da640d936137bb1c376846d9a3c8ba Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Tue, 18 Jul 2017 23:17:16 +0200
Subject: [PATCH] Fix finding icu on mingw32 cross compile

Change-Id: I38480d4fc706c5f327227ffc5dc312d20cfdc3b5
---
 src/corelib/configure.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/corelib/configure.json b/src/corelib/configure.json
index 2b3efbeb15..c01f6821d2 100644
--- a/src/corelib/configure.json
+++ b/src/corelib/configure.json
@@ -48,12 +48,12 @@
             "sources": [
                 {
                     "builds": {
-                        "debug": "-lsicuind -lsicuucd -lsicudtd",
-                        "release": "-lsicuin -lsicuuc -lsicudt"
+                        "debug": "-lsicui18nd -lsicuucd -lsicudatad",
+                        "release": "-lsicui18n -lsicuuc -lsicudata"
                     },
                     "condition": "config.win32 && !features.shared"
                 },
-                { "libs": "-licuin -licuuc -licudt", "condition": "config.win32 && features.shared" },
+                { "libs": "-licui18n -licuuc -licudata", "condition": "config.win32 && features.shared" },
                 { "libs": "-licui18n -licuuc -licudata", "condition": "!config.win32" }
             ],
             "use": [
-- 
2.12.3

--- a/src/3rdparty/icu_dependency.pri	2017-07-19 05:24:27.043706024 +0000
+++ b/src/3rdparty/icu_dependency.pri	2017-07-19 05:25:08.324216758 +0000
@@ -1,12 +1,12 @@
 win32 {
     CONFIG(static, static|shared) {
         CONFIG(debug, debug|release) {
-            LIBS_PRIVATE += -lsicuind -lsicuucd -lsicudtd
+            LIBS_PRIVATE += -lsicui18nd -lsicuucd -lsicudatad
         } else {
-            LIBS_PRIVATE += -lsicuin -lsicuuc -lsicudt
+            LIBS_PRIVATE += -lsicui18n -lsicuuc -lsicudata
         }
     } else {
-        LIBS_PRIVATE += -licuin -licuuc -licudt
+        LIBS_PRIVATE += -licui18n -licuuc -licudata
     }
 } else {
     LIBS_PRIVATE += -licui18n -licuuc -licudata

Places

File 0001-Fix-finding-icu-on-mingw64-cross-compile.patch of Package mingw64-libqt5-qtbase (Revision 6ce4f59f1b1e420614e9ac09b0c8fd1a)

Places