diff options
author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-09-07 10:48:31 +0200 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-09-10 08:20:09 +0000 |
commit | c0d77f8bb31d50b73543ef41875cdb4737aebb92 (patch) | |
tree | 789ed9ade664864a1f8351a60a0ccf971f4838f3 /src/compositor/compositor_api/qwaylandquickcompositor.cpp | |
parent | 0bd742ca93eca63305b9aaade78b14b202f34dfa (diff) |
Remove legacy naming
Change-Id: Ibf7fad69085b4439b7d5cc3fd1a7aa24ed9e03c3
Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
Diffstat (limited to 'src/compositor/compositor_api/qwaylandquickcompositor.cpp')
-rw-r--r-- | src/compositor/compositor_api/qwaylandquickcompositor.cpp | 27 |
1 files changed, 0 insertions, 27 deletions
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() { |