From: Tomasz Olszak <olszak.tomasz@gmail.com>
Date: Sat, 29 Jun 2013 14:31:37 +0000 (+0000)
Subject: Added ApplicationStateChangeEvent handling to QQuickApplication.
X-Git-Tag: upstream/5.2.1~771
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1fdacbebde6aa63a0a1eeedb028b7f9f279aa391;p=platform%2Fupstream%2Fqtdeclarative.git

Added ApplicationStateChangeEvent handling to QQuickApplication.

Change-Id: I8b8965bc36b483be7287abf4485221f428a0b92a
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
---

diff --git a/src/quick/util/qquickapplication.cpp b/src/quick/util/qquickapplication.cpp
index bc8b724..2de28a9 100644
--- a/src/quick/util/qquickapplication.cpp
+++ b/src/quick/util/qquickapplication.cpp
@@ -103,9 +103,15 @@ bool QQuickApplication::eventFilter(QObject *, QEvent *event)
 {
     Q_D(QQuickApplication);
     if ((event->type() == QEvent::ApplicationActivate) ||
-        (event->type() == QEvent::ApplicationDeactivate)) {
+        (event->type() == QEvent::ApplicationDeactivate) ||
+        (event->type() == QEvent::ApplicationStateChange)) {
         bool wasActive = d->isActive;
-        d->isActive = (event->type() == QEvent::ApplicationActivate);
+        if (event->type() == QEvent::ApplicationStateChange) {
+            QApplicationStateChangeEvent * e= static_cast<QApplicationStateChangeEvent*>(event);
+            d->isActive = e->applicationState() == Qt::ApplicationActive;
+        } else {
+            d->isActive = (event->type() == QEvent::ApplicationActivate);
+        }
         if (d->isActive != wasActive) {
             emit activeChanged();
         }