diff options
| author | Alan Alpert <aalpert@rim.com> | 2013-02-18 21:07:15 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-05 22:37:25 +0100 |
| commit | dfefcba06efc0ad239cb7f9ad5d9a5f9540841db (patch) | |
| tree | 5e0bd8c615d672a2bac10a3dc22c970d5f1e3215 /src/quick/util/qquickapplication.cpp | |
| parent | 23b7579e4d82e2c0a840b55adf7817ffb6b4389c (diff) | |
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>
Diffstat (limited to 'src/quick/util/qquickapplication.cpp')
| -rw-r--r-- | src/quick/util/qquickapplication.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/quick/util/qquickapplication.cpp b/src/quick/util/qquickapplication.cpp index 1e2a421bcb..bc8b724a00 100644 --- a/src/quick/util/qquickapplication.cpp +++ b/src/quick/util/qquickapplication.cpp @@ -46,10 +46,11 @@ #include <qpa/qplatformintegration.h> #include <QtGui/QGuiApplication> #include <QtCore/QDebug> +#include <QtQml/private/qqmlglobal_p.h> QT_BEGIN_NAMESPACE -class QQuickApplicationPrivate : public QObjectPrivate +class QQuickApplicationPrivate : public QQmlApplicationPrivate { Q_DECLARE_PUBLIC(QQuickApplication) public: @@ -70,7 +71,7 @@ private: */ QQuickApplication::QQuickApplication(QObject *parent) - : QObject(*new QQuickApplicationPrivate(), parent) + : QQmlApplication(*new QQuickApplicationPrivate(), parent) { if (qApp) { qApp->installEventFilter(this); |