diff options
Diffstat (limited to 'doc/src/platforms/windows.qdoc')
| -rw-r--r-- | doc/src/platforms/windows.qdoc | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc index 7e9551da..e228b023 100644 --- a/doc/src/platforms/windows.qdoc +++ b/doc/src/platforms/windows.qdoc @@ -35,8 +35,9 @@ Before you get started, ensure that your development environment fulfills the \l{Qt for Windows Requirements}{requirements}. - The \e{Reference Configuration} section of the \l{Supported Platforms} page - contains the list of Windows version and the compiler tested to work with + The \e{Reference Configuration} section of the + \l{Community Supported Platforms#Reference Configurations}{supported platforms} + page contains a list of Windows versions and compilers tested to work with Qt. \section1 Downloading and Installing Qt @@ -123,10 +124,10 @@ application folder or by adding the \e bin folder of the ICU installation to the \c PATH environment variable. - \li \l{ANGLE}: This library converts - OpenGL ES 2.0 API calls to DirectX 9, removing the need to install - graphics drivers on the target machines. Building - the library requires the installation of the \l{Direct X SDK}. + \li \l{ANGLE}: This library converts OpenGL ES 2.0 API calls to DirectX 11 or DirectX 9 + calls (depending on availability), removing the need to install graphics drivers on + the target machines. + Building the library requires the installation of the \l{Direct X SDK}. More information is available at \l{http://code.google.com/p/angleproject/wiki/DevSetup} \note When building for 64-bit environments, de-activate the @@ -170,8 +171,14 @@ higher is required. The default driver from Windows is OpenGL 1.1. Qt includes a version of the \l{ANGLE} project which is included from the Windows Qt installers. ANGLE implements the - OpenGL ES 2.0 API on top of DirectX 9. ANGLE requires that the DirectX SDK - is installed when building Qt. + OpenGL ES 2.0 API on top of DirectX 11 or DirectX 9. + ANGLE requires that the DirectX SDK is installed when building Qt. + + ANGLE chooses the render backend depending on availability. DirectX 11 + is usually preferable. However, some graphics cards may not fully + support it. For these cases, the environment variable \c QT_ANGLE_PLATFORM + (introduced in Qt 5.4) can be used to control the render backend. Possible + values are \c d3d11, \c d3d9 and \c warp. To use a custom version of ANGLE, set the \c ANGLE_DIR environment variable to point to the ANGLE source tree before building Qt. @@ -440,7 +447,9 @@ to build Qt including Qt WebKit. For more information about the MinGW builds, visit the - \e{Reference Configuration} section of the \l{Supported Platforms} page. + \e{Reference Configuration} section of the + \l{Community Supported Platforms#Reference Configurations}{supported platforms} + page. \section1 Intel C++ Compiler (Windows, Altix) |