summaryrefslogtreecommitdiffstats
path: root/doc/src/development/qmake-manual.qdoc
diff options
context:
space:
mode:
Diffstat (limited to 'doc/src/development/qmake-manual.qdoc')
-rw-r--r--doc/src/development/qmake-manual.qdoc28
1 files changed, 16 insertions, 12 deletions
diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index eaf6cd0..688122b 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -872,7 +872,7 @@
Developers using Visual Studio to write Qt applications can use the
Visual Studio integration facilities provided with the
- \l{Qt Commercial Editions} and do not need to worry about how
+ \l{Qt Commercial Edition} and do not need to worry about how
project dependencies are managed.
However, some developers may need to import an existing \c qmake project
@@ -1329,9 +1329,13 @@
\target DEF_FILE
\section1 DEF_FILE
- \e {This is only used on Windows when using the \c app template}.
+ \e {This is only used on Windows when using the \c app template,
+ and on Symbian when building a shared DLL}.
- Specifies a \c .def file to be included in the project.
+ Specifies a \c .def file to be included in the project. On Symbian
+ a directory may be specified instead, in which case the real files
+ will be located under the standard Symbian directories \c bwins and
+ \c eabi.
\target DEPENDPATH
\section1 DEPENDPATH
@@ -2004,7 +2008,7 @@ distinction between shared and
\section1 QMAKE_CFLAGS_WARN_OFF
This variable is not empty if the warn_off
- \l{#TEMPLATE}{TEMPLATE} option is specified. The value of this
+ \l{#CONFIG}{CONFIG} option is specified. The value of this
variable is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf}
and rarely needs to be modified.
@@ -2012,7 +2016,7 @@ distinction between shared and
\section1 QMAKE_CFLAGS_WARN_ON
This variable is not empty if the warn_on
- \l{#TEMPLATE}{TEMPLATE} option is specified.
+ \l{#CONFIG}{CONFIG} option is specified.
The value of this variable is typically handled by
\c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs
to be modified.
@@ -2279,11 +2283,11 @@ For example:
If the OpenGL implementation uses EGL (most OpenGL/ES systems),
then QMAKE_INCDIR_EGL may also need to be set.
- \section1 QMAKE_INCDIR_OPENGL_ES1, QMAKE_INCDIR_OPENGL_ES1CL, QMAKE_INCDIR_OPENGL_ES2
+ \section1 QMAKE_INCDIR_OPENGL_ES1, QMAKE_INCDIR_OPENGL_ES2
These variables contain the location of OpenGL headers files to be added
- to INCLUDEPATH when building an application with OpenGL ES 1, OpenGL ES 1 Common
- Lite or OpenGL ES 2 support respectively.
+ to INCLUDEPATH when building an application with OpenGL ES 1
+ or OpenGL ES 2 support respectively.
The value of this variable is typically handled by \c qmake or
\l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
@@ -2537,10 +2541,10 @@ For example:
variable is typically handled by \c qmake or
\l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
- \section1 QMAKE_LIBS_OPENGL_ES1, QMAKE_LIBS_OPENGL_ES1CL, QMAKE_LIBS_OPENGL_ES2
+ \section1 QMAKE_LIBS_OPENGL_ES1, QMAKE_LIBS_OPENGL_ES2
- These variables contain all the OpenGL libraries for OpenGL ES 1,
- OpenGL ES 1 Common Lite profile and OpenGL ES 2.
+ These variables contain all the OpenGL libraries for OpenGL ES 1
+ and OpenGL ES 2.
The value of these variables is typically handled by \c qmake or
\l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
@@ -2609,7 +2613,7 @@ For example:
\section1 QMAKE_LIBS_THREAD
- \e {This is used on Unix platforms only.}
+ \e {This is used on Unix and Symbian platforms only.}
This variable contains all libraries that need to be linked against
when building a multi-threaded application. The