diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-03-19 03:18:51 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-03-19 03:18:51 (GMT) |
| commit | fd520c032eabab22acfabe9ffdc5929e168a279f (patch) | |
| tree | 9c5b3ecb9407b6aeeb7af48ba94a430aa1b4f8db /doc | |
| parent | d05ecf5998d8ef2b344f3763fbf97f7426336728 (diff) | |
| parent | 8a7de547942c9a660dfc45c176ea1a3027bbf99a (diff) | |
| download | Qt-fd520c032eabab22acfabe9ffdc5929e168a279f.zip Qt-fd520c032eabab22acfabe9ffdc5929e168a279f.tar.gz Qt-fd520c032eabab22acfabe9ffdc5929e168a279f.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/development/qmake-manual.qdoc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc index 8e1d970..8cb8705 100644 --- a/doc/src/development/qmake-manual.qdoc +++ b/doc/src/development/qmake-manual.qdoc @@ -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 @@ -2601,7 +2605,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 |