summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-07-05 19:16:53 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-07-05 19:16:53 (GMT)
commit6f1b1f4e5eb6666ed25f770ded1a721b5d1e4907 (patch)
tree9700668d9f8c787835e5c90f040748ae0e9520d0 /doc
parentd4bed7dac60406fb98cc6c2b67689db153a56abf (diff)
parentfa650284ad6a838118946be88ac9c73a83361391 (diff)
downloadQt-6f1b1f4e5eb6666ed25f770ded1a721b5d1e4907.zip
Qt-6f1b1f4e5eb6666ed25f770ded1a721b5d1e4907.tar.gz
Qt-6f1b1f4e5eb6666ed25f770ded1a721b5d1e4907.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: Support time zone designator in QDateTime::fromString() based on ISO 8601-2004 standard.
Diffstat (limited to 'doc')
-rw-r--r--doc/src/external-resources.qdoc7
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index d4dc2b1..cbd66ee 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -410,6 +410,11 @@
*/
/*!
+ \externalpage http://www.iso.org/iso/date_and_time_format
+ \title ISO 8601
+*/
+
+/*!
\externalpage http://opensource.org/licenses/bsd-license.php
\title New and Modified BSD Licenses
-*/
+*/ \ No newline at end of file