diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-11-03 16:20:50 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-11-03 16:30:22 +0100 |
| commit | e1f062913f01db81d6da54ec53fe728665980a0e (patch) | |
| tree | f6759a8f8933504ea9c270ca04630c3faa51a349 /src/qml/qml | |
| parent | 46a9142746ef6e16401f402870d980f2af10377e (diff) | |
Expose QQmlPlatform and QQmlApplication to QML
As properties of the Qt object they need to be visible.
Change-Id: Ic6357b92f4fae36240e8dbce8976eeb6f9f41bf0
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
Diffstat (limited to 'src/qml/qml')
| -rw-r--r-- | src/qml/qml/qqmlglobal_p.h | 3 | ||||
| -rw-r--r-- | src/qml/qml/qqmlplatform_p.h | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlglobal_p.h b/src/qml/qml/qqmlglobal_p.h index 365bb1aa15..5634ada7d1 100644 --- a/src/qml/qml/qqmlglobal_p.h +++ b/src/qml/qml/qqmlglobal_p.h @@ -55,6 +55,7 @@ #include <QtCore/QObject> #include <private/qqmlmetaobject_p.h> #include <private/qmetaobject_p.h> +#include <QtQml/qqml.h> QT_BEGIN_NAMESPACE @@ -274,6 +275,8 @@ class Q_QML_PRIVATE_EXPORT QQmlApplication : public QObject Q_PROPERTY(QString version READ version WRITE setVersion NOTIFY versionChanged) Q_PROPERTY(QString organization READ organization WRITE setOrganization NOTIFY organizationChanged) Q_PROPERTY(QString domain READ domain WRITE setDomain NOTIFY domainChanged) + QML_ANONYMOUS + QML_ADDED_IN_VERSION(2, 0) public: QQmlApplication(QObject* parent=nullptr); diff --git a/src/qml/qml/qqmlplatform_p.h b/src/qml/qml/qqmlplatform_p.h index af33dffca3..8378854a80 100644 --- a/src/qml/qml/qqmlplatform_p.h +++ b/src/qml/qml/qqmlplatform_p.h @@ -62,6 +62,8 @@ class Q_QML_PRIVATE_EXPORT QQmlPlatform : public QObject Q_OBJECT Q_PROPERTY(QString os READ os CONSTANT) Q_PROPERTY(QString pluginName READ pluginName CONSTANT) + QML_ANONYMOUS + QML_ADDED_IN_VERSION(2, 0) public: explicit QQmlPlatform(QObject *parent = nullptr); |