diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc index 5733205a835c2357765cc2a90deb670c365a4d9c..901e723bee9ade76d81262aa6cdc3d47a861efc3 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: