From dfefcba06efc0ad239cb7f9ad5d9a5f9540841db Mon Sep 17 00:00:00 2001
From: Alan Alpert <aalpert@rim.com>
Date: Mon, 18 Feb 2013 21:07:15 -0800
Subject: Add core application functionality to Qt.application in QML

This exposes some information to QML which is available on
the QCoreApplication instance.

A future change should make it possible to restrict this for use in scripting
environments (which should not have access to the QCoreApplication). That has
been left out of this change because proper support for such restrictions is
not yet in place.

Change-Id: Ica144fcfb0b42fa6df8d0cb1c7c03eb97282b489
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
---
 src/quick/util/qquickapplication_p.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/quick/util/qquickapplication_p.h')

diff --git a/src/quick/util/qquickapplication_p.h b/src/quick/util/qquickapplication_p.h
index 2eef59b608..cccc024282 100644
--- a/src/quick/util/qquickapplication_p.h
+++ b/src/quick/util/qquickapplication_p.h
@@ -44,13 +44,14 @@
 
 #include <QtCore/QObject>
 #include <qqml.h>
+#include <QtQml/private/qqmlglobal_p.h>
 #include <private/qtquickglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
 
 class QQuickApplicationPrivate;
-class Q_AUTOTEST_EXPORT QQuickApplication : public QObject
+class Q_AUTOTEST_EXPORT QQuickApplication : public QQmlApplication
 {
     Q_OBJECT
     Q_PROPERTY(bool active READ active NOTIFY activeChanged)
-- 
cgit v1.2.3