summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2011-04-18 15:36:22 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2011-05-04 17:03:17 (GMT)
commitfc726b7e65cadce1147cdcb7d38d37e4c7693385 (patch)
tree361aab356c197b38412c530417a56b5491b27aa6 /doc
parentd1e70c3dd05df1f92f7a895de0b86b0c3a562511 (diff)
downloadQt-fc726b7e65cadce1147cdcb7d38d37e4c7693385.zip
Qt-fc726b7e65cadce1147cdcb7d38d37e4c7693385.tar.gz
Qt-fc726b7e65cadce1147cdcb7d38d37e4c7693385.tar.bz2
Doc: Added a note about the dll CONFIG option.
Task-number: QTBUG-587 (cherry picked from commit b1c421239ddb16a6c259af2298e0608961a1f3ba)
Diffstat (limited to 'doc')
-rw-r--r--doc/src/development/qmake-manual.qdoc7
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index b72c67e..65879b3 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -1253,11 +1253,12 @@
automatically be added to the project.
\row \o console \o The target is a Win32 console application (app only). The
proper include paths, compiler flags and libraries will
- automatically be added to the
- project.
+ automatically be added to the project.
\row \o shared \o{1,3} The target is a shared object/DLL. The proper
include paths, compiler flags and libraries will automatically be
- added to the project.
+ added to the project. Note that \c dll can also be used on all platforms;
+ a shared library file with the appropriate suffix for the target platform
+ (dll, so, dylib) will be created.
\row \o dll \o
\row \o dylib \o
\row \o static \o{1,2} The target is a static library (lib only). The proper