diff options
author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-03-18 15:23:56 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-03-18 22:27:24 +0000 |
commit | dcf0ececbf167502ac9943c6435bb9ddeeb29d5e (patch) | |
tree | 19416d427b84f0a90e0d3028588404a544003734 /src/corelib/doc/src | |
parent | 7aad6b9fd426e05fdfb3892d60432a45e4079887 (diff) | |
parent | 198606f6dbca95ba3a170fff387327d8271018cd (diff) |
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/doc/src')
-rw-r--r-- | src/corelib/doc/src/datastreamformat.qdoc | 14 |
1 files changed, 12 insertions, 2 deletions
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 |