diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-09-10 11:02:53 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-10-15 16:05:52 +0200 |
| commit | bccf872b94944dfa476ccedc1d1a45d380703e15 (patch) | |
| tree | 69044e2578015a94c1d2e1c92d76f2f0e2107a10 /src/quick/items/qquickwindowmodule.cpp | |
| parent | 3d0bec491e6d823df510ba12dba38be820116e86 (diff) | |
Move type declarations for QtQuick.Window* into imports/window
We want only one URI per library or plugin, so that we can centrally
register the types.
Change-Id: Ibc7305f102503ce672f8751771779102be44e014
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/quick/items/qquickwindowmodule.cpp')
| -rw-r--r-- | src/quick/items/qquickwindowmodule.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/quick/items/qquickwindowmodule.cpp b/src/quick/items/qquickwindowmodule.cpp index 0f952d194c..ee90af4341 100644 --- a/src/quick/items/qquickwindowmodule.cpp +++ b/src/quick/items/qquickwindowmodule.cpp @@ -48,6 +48,7 @@ #include <private/qguiapplication_p.h> #include <private/qqmlengine_p.h> #include <private/qv4qobjectwrapper_p.h> +#include <private/qqmlglobal_p.h> #include <qpa/qplatformintegration.h> QT_BEGIN_NAMESPACE @@ -195,19 +196,6 @@ void QQuickWindowQmlImpl::setScreen(QObject *screen) QWindow::setScreen(screenWrapper ? screenWrapper->wrappedScreen() : nullptr); } -void QQuickWindowModule::defineModule() -{ - const char uri[] = "QtQuick.Window"; - - // Cannot automatically register these. They are from QtGui. - qmlRegisterRevision<QWindow,1>(uri, 2, 1); - qmlRegisterRevision<QWindow,2>(uri, 2, 2); - qmlRegisterRevision<QWindow,13>(uri, 2, 13); - - qmlRegisterTypesAndRevisions<QQuickWindow, QQuickWindowQmlImpl, - QQuickScreen, QQuickScreenInfo>(uri, 2); -} - QT_END_NAMESPACE #include "moc_qquickwindowmodule_p.cpp" |