diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2017-03-24 12:08:50 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2017-03-28 10:54:56 +0000 |
| commit | 7853e8e51a65aa5c5d9e4c9bb66549e17a2ff022 (patch) | |
| tree | f0a12c96cc62841568abc19e904fdf67f563e79c | |
| parent | 64eaa17f22bce9804266f49a8e84ef1f041a061c (diff) | |
| download | qtdoc-7853e8e51a65aa5c5d9e4c9bb66549e17a2ff022.tar.gz | |
Doc: Fix name of ANGLE libraries
libEGL.dll, libGLESv2.dll got merged into QtANGLE.dll in Qt 5.9.
Change-Id: I4bb5b6536e9ba595e78829ffc3916ab6b1640445
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| -rw-r--r-- | doc/src/platforms/windows.qdoc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc index d7d4693c..70cb7b8c 100644 --- a/doc/src/platforms/windows.qdoc +++ b/doc/src/platforms/windows.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -221,7 +221,7 @@ When configured with \c{-opengl dynamic}, neither Qt nor the applications built using \c qmake will link to the opengl32 (standard desktop OpenGL) or - libGLESv2 (ANGLE) libraries. Instead, the appropriate library is chosen at + QtANGLE libraries. Instead, the appropriate library is chosen at runtime. By default, Qt will determine whether the system's opengl32.dll provides OpenGL 2 functions. If these are present, opengl32.dll is used, otherwise the ANGLE libraries will be used. In case the ANGLE libraries are @@ -243,7 +243,7 @@ The dynamic loading has a significant impact on applications that contain native OpenGL calls: they may fail to link since \c qmake no longer - automatically adds opengl32.lib or libglesv2.lib. Instead, applications are + automatically adds opengl32.lib or QtANGLE.lib. Instead, applications are expected to use the OpenGL functions via the QOpenGLFunctions class. Thus the direct dependency on the OpenGL library is removed and all calls will be routed during runtime to the implementation chosen by Qt. @@ -717,9 +717,9 @@ additional information about plugins and how Qt searches for them. 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 + \c QtANGLE.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) + d3dcompiler_XX.dll, where XX is the version number that ANGLE was linked against. If Qt was configured to link against ICU or OpenSSL, the respective DLL's @@ -820,10 +820,9 @@ \table 100% \header - \li{3,1} File Name + \li{2,1} File Name \row - \li libEGL.dll - \li libGLESv2.dll + \li QtANGLE.dll \li d3dcompiler_XX.dll \endtable |