diff options
Diffstat (limited to 'src/quick/items/qquickwindowmodule.cpp')
| -rw-r--r-- | src/quick/items/qquickwindowmodule.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/quick/items/qquickwindowmodule.cpp b/src/quick/items/qquickwindowmodule.cpp index 91388ea30f..f472d5b867 100644 --- a/src/quick/items/qquickwindowmodule.cpp +++ b/src/quick/items/qquickwindowmodule.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "qquickwindowmodule_p.h" +#include "qquickwindowattached_p.h" #include "qquickscreen_p.h" #include "qquickview_p.h" #include <QtQuick/QQuickWindow> @@ -102,7 +103,7 @@ protected: { QV4::ExecutionEngine *v4 = QQmlEnginePrivate::getV4Engine(e); QV4::Scope scope(v4); - QV4::ScopedObject v(scope, new (v4->memoryManager) QQuickRootItemMarker(e, this)); + QV4::ScopedObject v(scope, QQuickRootItemMarker::create(e, this)); rootItemMarker = v; } } @@ -173,6 +174,10 @@ void QQuickWindowModule::defineModule() { const char uri[] = "QtQuick.Window"; + // Since Window is both an attached property and a createable type, + // the attached property declaration must come first so that it can + // be overridden below. + qmlRegisterUncreatableType<QQuickWindow>(uri, 2, 2, "Window", QQuickWindow::tr("Window is available via attached properties")); qmlRegisterType<QQuickWindow>(uri, 2, 0, "Window"); qmlRegisterRevision<QWindow,1>(uri, 2, 1); qmlRegisterRevision<QWindow,2>(uri, 2, 2); |