diff options
3 files changed, 0 insertions, 38 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp index c3c3a3179..0a2b28714 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandcompositor.cpp @@ -180,11 +180,6 @@ void QWaylandCompositorPrivate::init() QAbstractEventDispatcher *dispatcher = QGuiApplicationPrivate::eventDispatcher; QObject::connect(dispatcher, SIGNAL(aboutToBlock()), q, SLOT(processWaylandEvents())); - qRegisterMetaType<QtWayland::SurfaceBuffer*>("SurfaceBuffer*"); - qRegisterMetaType<QWaylandClient*>("WaylandClient*"); - qRegisterMetaType<QWaylandSurface*>("WaylandSurface*"); - qRegisterMetaType<QWaylandView*>("WaylandSurfaceView*"); - initializeHardwareIntegration(); initializeDefaultInputDevice(); diff --git a/src/compositor/compositor_api/qwaylandquickcompositor.cpp b/src/compositor/compositor_api/qwaylandquickcompositor.cpp index 42b56e40a..8ebd1b6f6 100644 --- a/src/compositor/compositor_api/qwaylandquickcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandquickcompositor.cpp @@ -48,41 +48,14 @@ QT_BEGIN_NAMESPACE QWaylandQuickCompositor::QWaylandQuickCompositor(QObject *parent) : QWaylandCompositor(parent) - , m_initializeLegazyQmlNames(true) { } void QWaylandQuickCompositor::create() { - if (m_initializeLegazyQmlNames) - registerLegacyQmlNames(); - QWaylandCompositor::create(); } -void QWaylandQuickCompositor::registerLegacyQmlNames() -{ - static bool initialized = false; - if (!initialized) { - qmlRegisterUncreatableType<QWaylandQuickItem>("QtCompositor", 1, 0, "WaylandSurfaceItem", QObject::tr("Cannot create instance of WaylandSurfaceItem")); - qmlRegisterUncreatableType<QWaylandQuickSurface>("QtCompositor", 1, 0, "WaylandQuickSurface", QObject::tr("Cannot create instance of WaylandQuickSurface")); - qmlRegisterUncreatableType<QWaylandClient>("QtCompositor", 1, 0, "WaylandClient", QObject::tr("Cannot create instance of WaylandClient")); - qmlRegisterUncreatableType<QWaylandOutput>("QtCompositor", 1, 0, "WaylandOutput", QObject::tr("Cannot create instance of WaylandOutput")); - initialized = true; - } -} - -bool QWaylandQuickCompositor::initializeLegazyQmlNames() const -{ - return m_initializeLegazyQmlNames; -} - -void QWaylandQuickCompositor::setInitializeLegazyQmlNames(bool init) -{ - if (isCreated()) - qWarning() << Q_FUNC_INFO << "modifying initializeLegazyQmlNames after the compositor is created is not supported"; - m_initializeLegazyQmlNames = init; -} QWaylandSurface *QWaylandQuickCompositor::createDefaultSurfaceType() { diff --git a/src/compositor/compositor_api/qwaylandquickcompositor.h b/src/compositor/compositor_api/qwaylandquickcompositor.h index 126d299a2..21778d2ce 100644 --- a/src/compositor/compositor_api/qwaylandquickcompositor.h +++ b/src/compositor/compositor_api/qwaylandquickcompositor.h @@ -50,21 +50,15 @@ class Q_COMPOSITOR_EXPORT QWaylandQuickCompositor : public QWaylandCompositor, p { Q_INTERFACES(QQmlParserStatus) Q_OBJECT - Q_PROPERTY(bool initializeLegazyQmlNames READ initializeLegazyQmlNames WRITE setInitializeLegazyQmlNames) public: QWaylandQuickCompositor(QObject *parent = 0); void create() Q_DECL_OVERRIDE; - static void registerLegacyQmlNames(); - bool initializeLegazyQmlNames() const; - void setInitializeLegazyQmlNames(bool init); - protected: void classBegin() Q_DECL_OVERRIDE; void componentComplete() Q_DECL_OVERRIDE; private: - bool m_initializeLegazyQmlNames; QWaylandSurface *createDefaultSurfaceType() Q_DECL_OVERRIDE; }; |