diff options
Diffstat (limited to 'src/corelib/global/qnamespace.qdoc')
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 677cddc87e..03ac8c6153 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -585,6 +585,10 @@ \value LocalDate \e{This enum value is deprecated.} Use Qt::SystemLocaleShortDate instead (or Qt::SystemLocaleLongDate if you want long dates). + \value RFC2822Date \l{RFC 2822}, \l{RFC 850} and \l{RFC 1036} format: either + \c{[ddd,] dd MMM yyyy hh:mm[:ss] +/-TZ} or \c{ddd MMM dd yyyy hh:mm[:ss] +/-TZ} + for combined dates and times. + \note For \c ISODate formats, each \c Y, \c M and \c D represents a single digit of the year, month and day used to specify the date. Each \c H, \c M and \c S represents a single digit of the hour, minute and second used to specify the time. @@ -1618,6 +1622,12 @@ \value Key_TouchpadOn \value Key_TouchpadOff \value Key_MicMute + \value Key_Red + \value Key_Green + \value Key_Yellow + \value Key_Blue + \value Key_ChannelUp + \value Key_ChannelDown \value Key_MediaLast \value Key_unknown @@ -2864,3 +2874,18 @@ nearest full second (e.g. an interval of 23500ms will be rounded to 24000ms, and 20300ms to 20000ms). */ + +/*! + \enum Qt::ScrollPhase + \since 5.2 + + This enum describes the phase of scrolling. + + \value ScrollBegin Scrolling is about to begin, but the scrolling + distance did not yet change. + + \value ScrollUpdate The scrolling distance has changed (default). + + \value ScrollEnd Scrolling has ended, but the scrolling distance + did not change anymore. +*/ |