summaryrefslogtreecommitdiffstats
path: root/src/compositor/compositor_api/qwaylandquickcompositor.cpp
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@theqtcompany.com>2015-07-30 14:53:35 +0200
committerJørgen Lind <jorgen.lind@theqtcompany.com>2015-08-28 13:09:42 +0200
commitce58545b220a49354533a27ef79cdbc8d50186cd (patch)
tree660232f61bc971d68c29b37acfa9c709f617c697 /src/compositor/compositor_api/qwaylandquickcompositor.cpp
parent5edaac978e01ead8648aad91f0d050748f7a8915 (diff)
Rework how we manage extensions
Diffstat (limited to 'src/compositor/compositor_api/qwaylandquickcompositor.cpp')
-rw-r--r--src/compositor/compositor_api/qwaylandquickcompositor.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickcompositor.cpp b/src/compositor/compositor_api/qwaylandquickcompositor.cpp
index 39dae9461..75027299b 100644
--- a/src/compositor/compositor_api/qwaylandquickcompositor.cpp
+++ b/src/compositor/compositor_api/qwaylandquickcompositor.cpp
@@ -60,6 +60,11 @@ void QWaylandQuickCompositor::create()
if (m_initializeLegazyQmlNames)
registerLegacyQmlNames();
+ if (m_exposeDefaultShell)
+ setExtensionFlags(extensionFlags() | QWaylandCompositor::DefaultShellExtension);
+ else
+ setExtensionFlags(extensionFlags() & !QWaylandCompositor::DefaultShellExtension);
+
QWaylandCompositor::create();
}
@@ -133,8 +138,8 @@ void QWaylandQuickCompositor::classBegin()
void QWaylandQuickCompositor::componentComplete()
{
- if (m_exposeDefaultShell)
- addDefaultShell();
+ //if (m_exposeDefaultShell)
+ //addDefaultShell();
}