From 04bf69d8793892fa2e7315d977043167a07586b6 Mon Sep 17 00:00:00 2001
From: Oliver Wolff <oliver.wolff@digia.com>
Date: Thu, 22 Nov 2012 11:28:18 +0100
Subject: [PATCH] Give a bit more information about deployment of ICU libraries
Task-number: QTBUG-28103
Change-Id: I391c931748af078c4c042f3e6987f029b5d9a3d7
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
---
doc/src/deployment/deployment.qdoc | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc
index 5733205a..901e723b 100644
--- a/doc/src/deployment/deployment.qdoc
+++ b/doc/src/deployment/deployment.qdoc
@@ -626,8 +626,10 @@
Qt relies on the \l{ICU} library for unicode support. Therefore, you must
include the ICU DLLs that are located in the \c bin directory of your Qt
- installation. These DLLs are version dependent and have to match the ones
- your Qt version was linked against.
+ installation if Qt was configured to use ICU. The Qt version bundled in
+ the Qt5 package uses ICU, so deployment is needed there. The ICU DLLs are
+ version dependent and have to match the ones your Qt version was linked
+ against.
If you are using \l{ANGLE} (the default) then you additionally
need to include both libEGL.dll and libGLESv2.dll from Qt's 'lib'
@@ -693,10 +695,6 @@
\row
\li The Qt Widgets module
\li {2, 1} \c qtwidgets5.dll
- \row
- \li The ICU DLLs
- \li {2, 1} \c icudtXX.dll, icuinXX.dll, icuioXX.dll, iculeXX.dll,
- iculxXX.dll, icutuXX.dll, icuucXX.dll
\endtable
In addition, the archive must contain the following compiler
@@ -717,6 +715,17 @@
\li \c msvcp100.dll
\endtable
+ If ICU was used, the archive must contain:
+
+ \table 100%
+ \header
+ \li{3,1} File Name
+ \row
+ \li icudtXX.dll
+ \li icuinXX.dll
+ \li icuucXX.dll
+ \endtable
+
Finally, if ANGLE was used, then the archive must additionally
contain:
--
GitLab