diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-08-03 16:53:24 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-08-03 16:53:24 (GMT) |
| commit | 11ad3b195d98b0a2234105da24d1faffd7ef95d6 (patch) | |
| tree | 9cf45a3df86a3ded2a50e32d993ab6414639bbd4 /doc | |
| parent | b83f3a98fe5688872b4bd9a871e544951cb33e29 (diff) | |
| parent | d8d2e9571684ff02036c951f1755acf8d487e607 (diff) | |
| download | Qt-11ad3b195d98b0a2234105da24d1faffd7ef95d6.zip Qt-11ad3b195d98b0a2234105da24d1faffd7ef95d6.tar.gz Qt-11ad3b195d98b0a2234105da24d1faffd7ef95d6.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/development/debug.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/development/qmake-manual.qdoc | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/doc/src/development/debug.qdoc b/doc/src/development/debug.qdoc index 36970ee..9e881d1 100644 --- a/doc/src/development/debug.qdoc +++ b/doc/src/development/debug.qdoc @@ -49,7 +49,7 @@ The basic stuff you need to know about debug libraries and frameworks is found at developer.apple.com in: \l{http://developer.apple.com/technotes/tn2004/tn2124.html#SECDEBUGLIB} - {Apple Technicle Note TN2124} Qt follows that. + {Apple Technical Note TN2124}. When you build Qt, frameworks are built by default, and inside the framework you will find both a release and a debug version (e.g., diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc index 0fdeff8..baa30fc 100644 --- a/doc/src/development/qmake-manual.qdoc +++ b/doc/src/development/qmake-manual.qdoc @@ -3015,6 +3015,13 @@ For example: \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 150 + \target SYMBIAN_VERSION + \section1 SYMBIAN_VERSION + + \e {This is only used on the Symbian platform.} + + Contains the version number of the underlying Symbian SDK; e.g. "9.2" or "Symbian3". + \target TARGET \section1 TARGET |