summaryrefslogtreecommitdiffstats
path: root/src/corelib/doc
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/doc')
-rw-r--r--src/corelib/doc/qtcore.qdocconf3
-rw-r--r--src/corelib/doc/src/datastreamformat.qdoc14
2 files changed, 14 insertions, 3 deletions
diff --git a/src/corelib/doc/qtcore.qdocconf b/src/corelib/doc/qtcore.qdocconf
index f3aff83a8b..df1ee4afea 100644
--- a/src/corelib/doc/qtcore.qdocconf
+++ b/src/corelib/doc/qtcore.qdocconf
@@ -36,7 +36,8 @@ exampledirs += \
../ \
snippets \
../../../examples/corelib \
- ../../../examples/network/dnslookup
+ ../../../examples/network/dnslookup \
+ ../../../examples/widgets/tools
imagedirs += images
diff --git a/src/corelib/doc/src/datastreamformat.qdoc b/src/corelib/doc/src/datastreamformat.qdoc
index c76cc1a95e..8ebc64ca85 100644
--- a/src/corelib/doc/src/datastreamformat.qdoc
+++ b/src/corelib/doc/src/datastreamformat.qdoc
@@ -129,7 +129,9 @@
\li \list
\li Date (QDate)
\li Time (QTime)
- \li The \l{Qt::TimeSpec}{time spec} (quint8)
+ \li The \l{Qt::TimeSpec}{time spec}
+ offsetFromUtc (qint32) if Qt::TimeSpec is offsetFromUtc
+ TimeZone(QTimeZone) if Qt::TimeSpec is TimeZone
\endlist
\row \li QEasingCurve
\li \list
@@ -145,11 +147,19 @@
\row \li QFont
\li \list
\li The family (QString)
- \li The point size (qint16)
+ \li The style name (QString)
+ \li The point size (double)
+ \li The pixel size (qint32)
\li The style hint (quint8)
+ \li The style strategy (quint16)
\li The char set (quint8)
\li The weight (quint8)
\li The font bits (quint8)
+ \li The font stretch (quint16)
+ \li The extended font bits (quint8)
+ \li The letter spacing (double)
+ \li The word spacing (double)
+ \li The hinting preference (quint8)
\endlist
\row \li QHash<Key, T>
\li \list