summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-08-03 09:58:10 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-08-03 09:58:10 (GMT)
commitdfb56c408b2561c194922f36a0d08c2dc7c43f9b (patch)
treeea31b1e33e91d4172b41ed5bffbde5af0490686a /doc/src
parenta41128af5373a0225c3548abd3eb82cd7e8f7a0e (diff)
parent1f816c18df27cf3b39f94759ceccdaa3514e4e8d (diff)
downloadQt-dfb56c408b2561c194922f36a0d08c2dc7c43f9b.zip
Qt-dfb56c408b2561c194922f36a0d08c2dc7c43f9b.tar.gz
Qt-dfb56c408b2561c194922f36a0d08c2dc7c43f9b.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed incorrect values for QSysInfo::symbianVersion(). Switched from using hardlinks to copies in Symbian building. Added SYMBIAN_VERSION variable to qmake. Moved the S60 version detection to the common symbian profile. Fixed circular dependency warning. Fixed rvct.h header inclusion on Symbian^3. Included libstdcppv5 support for the makefile build system. Prevented makefile build system from using platform provided paths. Fixed additional case differences between Gnupoc and Symbian^3.
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/development/qmake-manual.qdoc7
1 files changed, 7 insertions, 0 deletions
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