diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-07-17 11:26:19 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-07-17 10:38:05 +0000 |
| commit | fd1612d9b640fa80c49d3de17f8707318df6640c (patch) | |
| tree | be07d99798d7d343015ac19ebc1c335a059e3ebc /src/quick/items | |
| parent | 5d072dbb583050fe9338ca65e1c2b159c3f77692 (diff) | |
QQuickWindowQmlImpl: declare attached properties in the header
QQuickWindowQmlImpl is inherited by QQuickApplicationWindow in Qt Quick
Controls 2, which must register revisions (qmlRegisterRevision) in base
classes to make revisioned base class members available in AppWindow.
The fact that QQuickWindowQmlImpl provides attached properties must be
declared in the header so that qmlRegisterRevision<QQuickWindowQmlImpl>
in Qt Quick Controls 2 does not lose the Window-attached properties.
Task-number: QTBUG-61935
Change-Id: I634c8fe980b06279610953d9ded2c27d8627d5ea
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/quick/items')
| -rw-r--r-- | src/quick/items/qquickwindowmodule.cpp | 2 | ||||
| -rw-r--r-- | src/quick/items/qquickwindowmodule_p.h | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/quick/items/qquickwindowmodule.cpp b/src/quick/items/qquickwindowmodule.cpp index a5234d4f77..c1cc02568c 100644 --- a/src/quick/items/qquickwindowmodule.cpp +++ b/src/quick/items/qquickwindowmodule.cpp @@ -204,6 +204,4 @@ void QQuickWindowModule::defineModule() QT_END_NAMESPACE -QML_DECLARE_TYPEINFO(QQuickWindowQmlImpl, QML_HAS_ATTACHED_PROPERTIES) - #include "moc_qquickwindowmodule_p.cpp" diff --git a/src/quick/items/qquickwindowmodule_p.h b/src/quick/items/qquickwindowmodule_p.h index 16130bc8a0..869d5b9a8e 100644 --- a/src/quick/items/qquickwindowmodule_p.h +++ b/src/quick/items/qquickwindowmodule_p.h @@ -54,10 +54,10 @@ #include <private/qtquickglobal_p.h> #include <qquickwindow.h> #include <qqmlparserstatus.h> +#include <private/qquickwindowattached_p.h> QT_BEGIN_NAMESPACE -class QQuickWindowAttached; class QQuickWindowQmlImplPrivate; class Q_QUICK_PRIVATE_EXPORT QQuickWindowQmlImpl : public QQuickWindow, public QQmlParserStatus @@ -105,4 +105,7 @@ public: QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickWindowQmlImpl) +QML_DECLARE_TYPEINFO(QQuickWindowQmlImpl, QML_HAS_ATTACHED_PROPERTIES) + #endif |