aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/util/qquickapplication_p.h
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@digia.com>2013-08-29 17:18:06 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-17 18:29:51 +0200
commita6bdcc1bd1818260bd649e0643c7ca7b3cc5ca6b (patch)
treed9b1fff79febd850abc0f4ab401615d98f16b0df /src/quick/util/qquickapplication_p.h
parent886b1b1424816a32874ddd6d68b44de63fd6a877 (diff)
Expose "Qt.application.state".
This deprecates Qt.application.active. The new property can indicate more states than just active or inactive (currently Suspended and Hidden exists in addition to the aforementioned). Change-Id: I8d5bf72f89a357c13daf1625c20e8e7311dac013 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Diffstat (limited to 'src/quick/util/qquickapplication_p.h')
-rw-r--r--src/quick/util/qquickapplication_p.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/quick/util/qquickapplication_p.h b/src/quick/util/qquickapplication_p.h
index cccc024282..780fb1ffa6 100644
--- a/src/quick/util/qquickapplication_p.h
+++ b/src/quick/util/qquickapplication_p.h
@@ -54,9 +54,10 @@ class QQuickApplicationPrivate;
class Q_AUTOTEST_EXPORT QQuickApplication : public QQmlApplication
{
Q_OBJECT
- Q_PROPERTY(bool active READ active NOTIFY activeChanged)
+ Q_PROPERTY(bool active READ active NOTIFY activeChanged) // deprecated, use 'state' instead
Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection NOTIFY layoutDirectionChanged)
Q_PROPERTY(bool supportsMultipleWindows READ supportsMultipleWindows CONSTANT)
+ Q_PROPERTY(Qt::ApplicationState state READ state NOTIFY stateChanged)
public:
explicit QQuickApplication(QObject *parent = 0);
@@ -64,10 +65,12 @@ public:
bool active() const;
Qt::LayoutDirection layoutDirection() const;
bool supportsMultipleWindows() const;
+ Qt::ApplicationState state() const;
Q_SIGNALS:
void activeChanged();
void layoutDirectionChanged();
+ void stateChanged(Qt::ApplicationState state);
private:
bool eventFilter(QObject *, QEvent *event);