diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2016-08-02 14:29:36 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2016-08-03 10:15:09 +0000 |
| commit | fc1db763f86cedbec0410ffbe1d49073888890dd (patch) | |
| tree | 4adbddc82664a5c19ce2937a084440bbf30a23a0 | |
| parent | 69da000a9875e60f13693bc0c48a87dd85274271 (diff) | |
| download | qtdoc-fc1db763f86cedbec0410ffbe1d49073888890dd.tar.gz | |
Windows: Fix deployment of ICU
Qt Core doesn't link against ICU anymore by default since Qt 5.5, and
with Qt WebKit dropped from the 5.6 release there's no reason to
still discuss ICU as a 'hard' dependency.
Change-Id: I90672586dd97a6b43d317de8ccadb70ca7ca9729
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | doc/src/platforms/windows.qdoc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc index 699e1683..4c147dff 100644 --- a/doc/src/platforms/windows.qdoc +++ b/doc/src/platforms/windows.qdoc @@ -743,19 +743,15 @@ is a subdirectory named \c {platforms}. \l{Qt Plugins} section has additional information about plugins and how Qt searches for them. - Qt relies on the \l{ICU} library for unicode support. You must - include the ICU DLLs that are located in the \c bin directory of your Qt - 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 \l{ANGLE} (the default) is used, you additionally need to include both \c libEGL.dll and \c libGLESv2.dll from Qt's 'lib' directory as well as the HLSL compiler from DirectX. The HLSL compiler library, d3dcompiler_XX.dll, where XX is the version number that ANGLE (libGLESv2) was linked against. + If Qt was configured to link against ICU or OpenSSL, the respective DLL's + need to be added to the \c release folder, too. + If your application depends on Qt WebEngine, you must deploy \c{<Qt install path>/bin/QtWebEngineProcess.exe} to the application install path. If you chose to deploy the binary to a different path, set the @@ -851,7 +847,7 @@ \li \c msvcp100.dll \endtable - If ICU was used, the archive must contain: + If Qt was configured to use ICU, the archive must contain: \table 100% \header |