Document the EGL and OpenVG qmake.conf settings.

Reviewed-by: trustme

1 files changed, 65 insertions, 0 deletions

diff --git a/doc/src/qmake-manual.qdoc b/doc/src/qmake-manual.qdoc
index f8347c1..7960de7 100644
--- a/doc/src/qmake-manual.qdoc
+++ b/doc/src/qmake-manual.qdoc
@@ -1922,6 +1922,14 @@
     typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely
     needs to be modified.
 
+    \target QMAKE_INCDIR_EGL
+    \section1 QMAKE_INCDIR_EGL
+
+    This variable contains the location of EGL header files to be added
+    to INCLUDEPATH when building an application with OpenGL/ES or
+    OpenVG support. The value of this variable is typically handled by
+    \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
     \target QMAKE_INCDIR_OPENGL
     \section1 QMAKE_INCDIR_OPENGL
 
@@ -1930,6 +1938,20 @@
     value of this variable is typically handled by \c qmake or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
+    If the OpenGL implementation uses EGL (most OpenGL/ES systems),
+    then QMAKE_INCDIR_EGL may also need to be set.
+
+    \target QMAKE_INCDIR_OPENVG
+    \section1 QMAKE_INCDIR_OPENVG
+
+    This variable contains the location of OpenVG header files to be added
+    to INCLUDEPATH when building an application with OpenVG support. The
+    value of this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    If the OpenVG implementation uses EGL then QMAKE_INCDIR_EGL may also
+    need to be set.
+
     \target QMAKE_INCDIR_QT
     \section1 QMAKE_INCDIR_QT
 
@@ -2078,6 +2100,13 @@
     \c qmake or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
+    \section1 QMAKE_LIBDIR_EGL
+
+    This variable contains the location of the EGL library
+    directory, when EGL is used with OpenGL/ES or OpenVG. The value
+    of this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
     \section1 QMAKE_LIBDIR_OPENGL
 
     This variable contains the location of the OpenGL library
@@ -2085,6 +2114,19 @@
     \c qmake or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
+    If the OpenGL implementation uses EGL (most OpenGL/ES systems),
+    then QMAKE_LIBDIR_EGL may also need to be set.
+
+    \section1 QMAKE_LIBDIR_OPENVG
+
+    This variable contains the location of the OpenVG library
+    directory. The value of this variable is typically handled by
+    \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    If the OpenVG implementation uses EGL, then QMAKE_LIBDIR_EGL
+    may also need to be set.
+
     \section1 QMAKE_LIBDIR_QT
 
     This variable contains the location of the Qt library
@@ -2116,18 +2158,41 @@
     project on Windows. \l{#QMAKE_LIBS_WINDOW}{QMAKE_LIBS_WINDOW}
     should now be used instead.
 
+    \section1 QMAKE_LIBS_EGL
+
+    This variable contains all EGL libraries when building Qt with
+    OpenGL/ES or OpenVG.  The value of this variable is typically
+    handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely
+    needs to be modified.  The usual value is \c{-lEGL}.
+
     \section1 QMAKE_LIBS_OPENGL
 
     This variable contains all OpenGL libraries.  The value of this
     variable is typically handled by \c qmake or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
+    If the OpenGL implementation uses EGL (most OpenGL/ES systems),
+    then QMAKE_LIBS_EGL may also need to be set.
+
     \section1 QMAKE_LIBS_OPENGL_QT
 
     This variable contains all OpenGL Qt libraries.The value of this
     variable is typically handled by \c qmake or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
+    \section1 QMAKE_LIBS_OPENVG
+
+    This variable contains all OpenVG libraries.  The value of this
+    variable is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf}
+    and rarely needs to be modified.  The usual value is \c{-lOpenVG}.
+
+    Some OpenVG engines are implemented on top of OpenGL.  This will
+    be detected at configure time and QMAKE_LIBS_OPENGL will be implicitly
+    added to QMAKE_LIBS_OPENVG wherever the OpenVG libraries are linked.
+
+    If the OpenVG implementation uses EGL, then QMAKE_LIBS_EGL may also
+    need to be set.
+
     \section1 QMAKE_LIBS_QT
 
     This variable contains all Qt libraries.The value of this