diff options
| author | axis <qt-info@nokia.com> | 2010-03-15 12:09:33 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-03-15 12:09:33 (GMT) |
| commit | c75ffa607d036cb54663984e03af58108ab98757 (patch) | |
| tree | 66eb210b7a611a161cc06bf724f61bc5ac710072 /doc/src | |
| parent | 065f26ef3996368ba67ff5d8e34b20106c359a95 (diff) | |
| parent | b65a79f7079106233e32251e9a6ab0639cdad662 (diff) | |
| download | Qt-c75ffa607d036cb54663984e03af58108ab98757.zip Qt-c75ffa607d036cb54663984e03af58108ab98757.tar.gz Qt-c75ffa607d036cb54663984e03af58108ab98757.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/kamlies-qt-s60-linux-mkspec into 4.7-s60
Diffstat (limited to 'doc/src')
| -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 b17e255..1a34a6c 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 |