From 85ea2c02992660bc559736462bb2d99d03ccd681 Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Tue, 12 Mar 2013 10:53:48 +0100 Subject: ApplicationState: Add new event class: ApplicationStateChangeEvent MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Friedemann Kleint Reviewed-by: Samuel Rødal --- src/corelib/kernel/qcoreevent.cpp | 9 ++++++--- src/corelib/kernel/qcoreevent.h | 5 +++-- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'src/corelib/kernel') 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 diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h index 47a461d330..2ca0a7d0b0 100644 --- a/src/corelib/kernel/qcoreevent.h +++ b/src/corelib/kernel/qcoreevent.h @@ -167,9 +167,9 @@ public: ToolBarChange = 120, // toolbar visibility toggled - ApplicationActivate = 121, // application has been changed to active + ApplicationActivate = 121, // deprecated. Use ApplicationStateChange instead. ApplicationActivated = ApplicationActivate, // deprecated - ApplicationDeactivate = 122, // application has been changed to inactive + ApplicationDeactivate = 122, // deprecated. Use ApplicationStateChange instead. ApplicationDeactivated = ApplicationDeactivate, // deprecated QueryWhatsThis = 123, // query what's this widget help @@ -276,6 +276,7 @@ public: PlatformPanel = 212, StyleAnimationUpdate = 213, // style animation target should be updated + ApplicationStateChange = 214, // 512 reserved for Qt Jambi's MetaCall event // 513 reserved for Qt Jambi's DeleteOnMainThread event -- cgit v1.2.3