Commit 04bf69d8 authored by Oliver Wolff's avatar Oliver Wolff Committed by The Qt Project
Browse files

Give a bit more information about deployment of ICU libraries


Task-number: QTBUG-28103
Change-Id: I391c931748af078c4c042f3e6987f029b5d9a3d7
Reviewed-by: default avatarKai Koehne <kai.koehne@digia.com>
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@digia.com>
parent 989bb1a2
dev 5.10 5.11 5.12 5.12.1 5.12.10 5.12.11 5.12.12 5.12.2 5.12.3 5.12.4 5.12.5 5.12.6 5.12.7 5.12.8 5.12.9 5.13 5.13.0 5.13.1 5.13.2 5.14 5.14.0 5.14.1 5.14.2 5.15 5.15.0 5.15.1 5.15.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 5.9.8 6.0 6.0.0 6.1 6.1.0 6.1.1 6.1.2 6.1.3 6.2 6.2.0 6.2.1 6.2.2 old/5.0 old/5.1 old/5.2 tqtc/vxworks-5.5 wip/android v5.15.0-alpha1 v5.14.1 v5.14.0 v5.14.0-rc2 v5.14.0-rc1 v5.14.0-beta3 v5.14.0-beta2 v5.14.0-beta1 v5.14.0-alpha1 v5.13.2 v5.13.1 v5.13.0 v5.13.0-rc3 v5.13.0-rc2 v5.13.0-rc1 v5.13.0-beta4 v5.13.0-beta3 v5.13.0-beta2 v5.13.0-beta1 v5.13.0-alpha1 v5.12.7 v5.12.6 v5.12.5 v5.12.4 v5.12.3 v5.12.2 v5.12.1 v5.12.0 v5.12.0-rc2 v5.12.0-rc1 v5.12.0-beta4 v5.12.0-beta3 v5.12.0-beta2 v5.12.0-beta1 v5.12.0-alpha1 v5.11.3 v5.11.2 v5.11.1 v5.11.0 v5.11.0-rc2 v5.11.0-rc1 v5.11.0-beta4 v5.11.0-beta3 v5.11.0-beta2 v5.11.0-beta1 v5.11.0-alpha1 v5.10.1 v5.10.0 v5.10.0-rc3 v5.10.0-rc2 v5.10.0-rc1 v5.10.0-beta4 v5.10.0-beta3 v5.10.0-beta2 v5.10.0-beta1 v5.10.0-alpha1 v5.9.9 v5.9.8 v5.9.7 v5.9.6 v5.9.5 v5.9.4 v5.9.3 v5.9.2 v5.9.1 v5.9.0 v5.9.0-rc2 v5.9.0-rc1 v5.9.0-beta4 v5.9.0-beta3 v5.9.0-beta2 v5.9.0-beta1 v5.9.0-alpha1 v5.8.0 v5.8.0-rc1 v5.8.0-beta1 v5.8.0-alpha1 v5.7.1 v5.7.0 v5.7.0-rc1 v5.7.0-beta1 v5.7.0-alpha1 v5.6.3 v5.6.2 v5.6.1 v5.6.1-1 v5.6.0 v5.6.0-rc1 v5.6.0-beta1 v5.6.0-alpha1 v5.5.1 v5.5.0 v5.5.0-rc1 v5.5.0-beta1 v5.5.0-alpha1 v5.4.2 v5.4.1 v5.4.0 v5.4.0-rc1 v5.4.0-beta1 v5.4.0-alpha1 v5.3.2 v5.3.1 v5.3.0 v5.3.0-rc1 v5.3.0-beta1 v5.3.0-alpha1 v5.2.1 v5.2.0 v5.2.0-rc1 v5.2.0-beta1 v5.2.0-alpha1 v5.1.1 v5.1.0 v5.1.0-rc2 v5.1.0-rc1 v5.1.0-beta1 v5.1.0-alpha1 v5.0.2 v5.0.1 v5.0.0 v5.0.0-rc2 v5.0.0-rc1
No related merge requests found
Showing with 15 additions and 6 deletions
...@@ -626,8 +626,10 @@ ...@@ -626,8 +626,10 @@
Qt relies on the \l{ICU} library for unicode support. Therefore, you must 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 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 installation if Qt was configured to use ICU. The Qt version bundled in
your Qt version was linked against. 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 If you are using \l{ANGLE} (the default) then you additionally
need to include both libEGL.dll and libGLESv2.dll from Qt's 'lib' need to include both libEGL.dll and libGLESv2.dll from Qt's 'lib'
...@@ -693,10 +695,6 @@ ...@@ -693,10 +695,6 @@
\row \row
\li The Qt Widgets module \li The Qt Widgets module
\li {2, 1} \c qtwidgets5.dll \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 \endtable
In addition, the archive must contain the following compiler In addition, the archive must contain the following compiler
...@@ -717,6 +715,17 @@ ...@@ -717,6 +715,17 @@
\li \c msvcp100.dll \li \c msvcp100.dll
\endtable \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 Finally, if ANGLE was used, then the archive must additionally
contain: contain:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment