summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVenugopal Shivashankar <venugopal.shivashankar@digia.com>2015-03-24 15:22:26 +0100
committerVenugopal Shivashankar <venugopal.shivashankar@digia.com>2015-03-30 11:01:00 +0000
commit78c6a8d61218dbe09c89653691b54ae17d419a31 (patch)
tree268fcd4247dfe57627f3a31b5699c69a073861e1
parentc7d692641ad94e45795e92c1c294f39073d6f930 (diff)
downloadqtdoc-78c6a8d61218dbe09c89653691b54ae17d419a31.tar.gz
Doc: Updated information about using -opengl on Windows.
Change-Id: I2989f2c850b6a899dc399698c54bc321c0582572 Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
-rw-r--r--doc/src/configure.qdoc20
1 files changed, 12 insertions, 8 deletions
diff --git a/doc/src/configure.qdoc b/doc/src/configure.qdoc
index 9a378096..98a5d0c7 100644
--- a/doc/src/configure.qdoc
+++ b/doc/src/configure.qdoc
@@ -248,20 +248,20 @@
\section1 OpenGL Options for Windows
On Windows, Qt can be configured with the system OpenGL or with \l{ANGLE}.
- By default, configure uses ANGLE, which is bundled with the Qt
- sources, but requires the DirectX SDK. Through ANGLE, OpenGL ES 2.0 is
- mapped to DirectX APIs. OpenGL applications can then be deployed to Windows
- computers with older OpenGL APIs, without requiring that the latest
- OpenGL version be installed in the system.
+ By default, Qt is configured to use ANGLE, which is bundled with Qt and
+ depends on the DirectX SDK. ANGLE enables running Qt applications that
+ depend on OpenGL, without installing the latest OpenGL libraries.
- The \c -opengl option configures Qt to use the OpenGL in the target system
- or a different version of OpenGL ES.
+ The \c -opengl option can be used to configure Qt to use
+ the OpenGL in the target system, a different version of OpenGL ES (with or
+ without ANGLE), or dynamically switch between the available OpenGL
+ implementations.
\code
configure.bat -opengl desktop
\endcode
- With the \c desktop option, Qt uses the OpenGL installed in Windows,
+ With the \c desktop option, Qt uses the OpenGL installed on Windows,
requiring that the OpenGL in the target Windows machine is compatible with
the application. The \c -opengl option accepts two versions of OpenGL ES, \c
es2 for OpenGL ES 2.0 or \c es1 for OpenGL ES Common Profile.
@@ -270,4 +270,8 @@
configure.bat -opengl es2
\endcode
+ You can also use \c{-opengl dynamic}, which enable applications to
+ dynamically switch between the available options at runtime. For more
+ details about the benefits of using dynamic GL-switching, see
+ \l{Graphics Drivers}.
*/