diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-28 21:32:56 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-28 21:33:17 +0200 |
commit | 182983943b76bc0e40ff7693853ef2262323fa80 (patch) | |
tree | 4e542c3f2906e348da045375c3a3a85fc1d0d73c /src/quick/items/qquickwindowmodule.cpp | |
parent | 8ced0f0f9954f857265fd18080da95427069135d (diff) | |
parent | 80e03bbd9a42401d50af450aff5351c3a0c95444 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I7d092cce33cb009d63e7b0df7c71183089dea53f
Diffstat (limited to 'src/quick/items/qquickwindowmodule.cpp')
-rw-r--r-- | src/quick/items/qquickwindowmodule.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/quick/items/qquickwindowmodule.cpp b/src/quick/items/qquickwindowmodule.cpp index a7f45534c4..45e3f0004d 100644 --- a/src/quick/items/qquickwindowmodule.cpp +++ b/src/quick/items/qquickwindowmodule.cpp @@ -205,6 +205,4 @@ void QQuickWindowModule::defineModule() QT_END_NAMESPACE -QML_DECLARE_TYPEINFO(QQuickWindowQmlImpl, QML_HAS_ATTACHED_PROPERTIES) - #include "moc_qquickwindowmodule_p.cpp" |