summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qcoreevent.cpp
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@digia.com>2013-03-12 10:53:48 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-03 10:15:40 +0200
commit85ea2c02992660bc559736462bb2d99d03ccd681 (patch)
tree9ef34d2f8bc02675717e0438112e02d7e75ebf36 /src/corelib/kernel/qcoreevent.cpp
parent15fca980e947b13069e85b51c9cd2240eb3c5fa5 (diff)
ApplicationState: Add new event class: ApplicationStateChangeEvent
This patch will follow up on e27ca37 (add more state to QT::ApplicationState), and add a new event class QApplicationStateChangeEvent with type Qt::ApplicationStateChange. Change-Id: Idee724f181f1fbb2321ddad7e0df00c88b3488b1 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src/corelib/kernel/qcoreevent.cpp')
-rw-r--r--src/corelib/kernel/qcoreevent.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp
index 7f91d61189..09fe7c60ca 100644
--- a/src/corelib/kernel/qcoreevent.cpp
+++ b/src/corelib/kernel/qcoreevent.cpp
@@ -98,12 +98,13 @@ QT_BEGIN_NAMESPACE
\value ActionChanged An action has been changed (QActionEvent).
\value ActionRemoved An action has been removed (QActionEvent).
\value ActivationChange A widget's top-level window activation state has changed.
- \value ApplicationActivate The application has been made available to the user.
- \value ApplicationActivated This enum has been deprecated. Use ApplicationActivate instead.
- \value ApplicationDeactivate The application has been suspended, and is unavailable to the user.
+ \value ApplicationActivate This enum has been deprecated. Use ApplicationStateChange instead.
+ \value ApplicationActivated This enum has been deprecated. Use ApplicationStateChange instead.
+ \value ApplicationDeactivate This enum has been deprecated. Use ApplicationStateChange instead.
\value ApplicationFontChange The default application font has changed.
\value ApplicationLayoutDirectionChange The default application layout direction has changed.
\value ApplicationPaletteChange The default application palette has changed.
+ \value ApplicationStateChange The state of the application has changed.
\value ApplicationWindowIconChange The application's icon has changed.
\value ChildAdded An object gets a child (QChildEvent).
\value ChildPolished A widget child gets polished (QChildEvent).
@@ -264,7 +265,9 @@ QT_BEGIN_NAMESPACE
\omitvalue Style
\omitvalue StyleAnimationUpdate
\omitvalue ZeroTimerEvent
+ \omitvalue ApplicationActivate
\omitvalue ApplicationActivated
+ \omitvalue ApplicationDeactivate
\omitvalue ApplicationDeactivated
\omitvalue MacGLWindowChange
\omitvalue MacGLClearDrawable