summaryrefslogtreecommitdiffstats
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-04-18 15:36:22 (GMT)
commitb1c421239ddb16a6c259af2298e0608961a1f3ba (patch)
treee40f97f693d0ffbf8498fd26a3682c393de1d0ed
parent4e8672c87bd7e740b01ca29a2a3c8ba902ed664b (diff)
downloadQt-b1c421239ddb16a6c259af2298e0608961a1f3ba.zip
Qt-b1c421239ddb16a6c259af2298e0608961a1f3ba.tar.gz
Qt-b1c421239ddb16a6c259af2298e0608961a1f3ba.tar.bz2
Doc: Added a note about the dll CONFIG option.
Task-number: QTBUG-587
-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 1c5d903..39aa606 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -1214,11 +1214,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