diff options
author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-20 12:26:39 +0200 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-28 13:10:33 +0200 |
commit | 88f821e189bd1d4d4550c1864f622ca7df2a7c34 (patch) | |
tree | 291fd0a8155c448ea13df57a6b1f6f7966894ed0 /examples | |
parent | 9c88f97492959025f7433c9a379b474095efc0dd (diff) |
Remove automatic initialisation of extensions
It is the specific compositor application responsibillity to create the
specific extensions. Some of the extensions are picked up with the
QWaylandExtension::findIn(QWaylandExtensionContainer *) function to work
around missing events/apis. It should be a goal not to have these calles
in the base implementation of QWayland[Compositor|Surface|Input..].
Change-Id: Iacd576f2e8a79ca0165b858b1e8f44cddad48d93
Diffstat (limited to 'examples')
-rw-r--r-- | examples/wayland/qml-compositor/main.cpp | 1 | ||||
-rw-r--r-- | examples/wayland/qwindow-compositor/qwindowcompositor.cpp | 4 | ||||
-rw-r--r-- | examples/wayland/server-buffer/compositor/main.cpp | 2 |
3 files changed, 0 insertions, 7 deletions
diff --git a/examples/wayland/qml-compositor/main.cpp b/examples/wayland/qml-compositor/main.cpp index f8a2116cd..605be4580 100644 --- a/examples/wayland/qml-compositor/main.cpp +++ b/examples/wayland/qml-compositor/main.cpp @@ -66,7 +66,6 @@ public: : m_fullscreenSurface(0) , m_output(0) { - m_compositor.setExtensionFlags(QWaylandCompositor::DefaultExtensions | QWaylandCompositor::SubSurfaceExtension); m_compositor.create(); setSource(QUrl("main.qml")); diff --git a/examples/wayland/qwindow-compositor/qwindowcompositor.cpp b/examples/wayland/qwindow-compositor/qwindowcompositor.cpp index 4eba15122..7e7aedf45 100644 --- a/examples/wayland/qwindow-compositor/qwindowcompositor.cpp +++ b/examples/wayland/qwindow-compositor/qwindowcompositor.cpp @@ -122,8 +122,6 @@ QWindowCompositor::QWindowCompositor(CompositorWindow *window) , m_cursorHotspotY(0) , m_modifiers(Qt::NoModifier) { - setExtensionFlags(DefaultExtensions | SubSurfaceExtension); - m_window->makeCurrent(); m_textureBlitter = new TextureBlitter(); @@ -143,8 +141,6 @@ QWindowCompositor::~QWindowCompositor() void QWindowCompositor::create() { - setExtensionFlags(extensionFlags()); - QWaylandCompositor::create(); primaryOutputSpace()->addOutputWindow(m_window, "", ""); diff --git a/examples/wayland/server-buffer/compositor/main.cpp b/examples/wayland/server-buffer/compositor/main.cpp index 1984cb0cd..99231d7be 100644 --- a/examples/wayland/server-buffer/compositor/main.cpp +++ b/examples/wayland/server-buffer/compositor/main.cpp @@ -80,8 +80,6 @@ public: , m_server_buffer_8_bit(0) , m_server_buffer_item_8_bit(0) { - setExtensionFlags(extensionFlags()); - create(); m_view.setSource(QUrl("qrc:/qml/main.qml")); m_view.setResizeMode(QQuickView::SizeRootObjectToView); |