diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-08-08 08:18:13 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-08-08 12:49:44 +0200 |
| commit | 2329a3145e59c16b5bbc37cedad7e67e16f14fb8 (patch) | |
| tree | 73900588daab4c2c91ef0ff6566818905375ca85 /src/quick/items/qquickwindowmodule_p.h | |
| parent | d0eb6f9e07156880c6d9de4b98b2e4abfc4a0bfb (diff) | |
| parent | 432e27ae092397cb2154f48103e729852c38cf2d (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/pointerhandler
Change-Id: I0af7b0c3e0a21aae68c82ec11c5ca579c1661ce9
Diffstat (limited to 'src/quick/items/qquickwindowmodule_p.h')
| -rw-r--r-- | src/quick/items/qquickwindowmodule_p.h | 5 |
1 files changed, 4 insertions, 1 deletions
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 |