diff options
Diffstat (limited to 'src/corelib/global/qnamespace.h')
| -rw-r--r-- | src/corelib/global/qnamespace.h | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 25c47d5d34..81329fd5ba 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -89,12 +89,14 @@ Qt { Q_ENUMS(ScreenOrientation) Q_FLAGS(ScreenOrientations) Q_ENUMS(ConnectionType) + Q_ENUMS(ApplicationState) #ifndef QT_NO_GESTURES Q_ENUMS(GestureState) Q_ENUMS(GestureType) #endif Q_ENUMS(CursorMoveStyle) Q_ENUMS(TimerType) + Q_ENUMS(ScrollPhase) #endif // defined(Q_MOC_RUN) #if defined(Q_MOC_RUN) @@ -982,6 +984,14 @@ public: Key_MicMute = 0x01000113, + Key_Red = 0x01000114, + Key_Green = 0x01000115, + Key_Yellow = 0x01000116, + Key_Blue = 0x01000117, + + Key_ChannelUp = 0x01000118, + Key_ChannelDown = 0x01000119, + Key_MediaLast = 0x0100ffff, // Keypad navigation keys @@ -1173,7 +1183,8 @@ public: SystemLocaleShortDate, SystemLocaleLongDate, DefaultLocaleShortDate, - DefaultLocaleLongDate + DefaultLocaleLongDate, + RFC2822Date // RFC 2822 (+ 850 and 1036 during parsing) }; enum TimeSpec { @@ -1560,6 +1571,12 @@ public: CoarseTimer, VeryCoarseTimer }; + + enum ScrollPhase { + ScrollBegin = 1, + ScrollUpdate, + ScrollEnd + }; } #ifdef Q_MOC_RUN ; |