diff options
| author | Tomasz Olszak <olszak.tomasz@gmail.com> | 2013-06-29 14:31:37 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-09 07:45:24 +0200 |
| commit | 1fdacbebde6aa63a0a1eeedb028b7f9f279aa391 (patch) | |
| tree | 6643ae393802a4ab3d393dd9ce6f42ac4690d2a8 /src/quick/util/qquickapplication.cpp | |
| parent | 8cc60ac9cc33192d8a0bc8ce9412fe059830eabd (diff) | |
Added ApplicationStateChangeEvent handling to QQuickApplication.
Change-Id: I8b8965bc36b483be7287abf4485221f428a0b92a
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Diffstat (limited to 'src/quick/util/qquickapplication.cpp')
| -rw-r--r-- | src/quick/util/qquickapplication.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/quick/util/qquickapplication.cpp b/src/quick/util/qquickapplication.cpp index bc8b724a00..2de28a9509 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(); } |