diff options
author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-05-13 14:44:05 +0200 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-28 13:10:32 +0200 |
commit | 666c3fcc69b9b25caa9b68b988e0004489653171 (patch) | |
tree | 00613a3861b5fb73978b1fd01e7e2f97f29de28d /src/compositor/compositor_api/qwaylandquickcompositor.cpp | |
parent | 5f3918b8046c461929daf62689da2cc75f7a988d (diff) |
Remove the default shell functionality
This will be readded in a different way. Also, remove the
WaylandSurfaceChrome since it is no longer needed, and just use
WaylandView directly
Change-Id: I8d4a7b2135d9fdaea7dd3fcd729e55cceebf48fb
Diffstat (limited to 'src/compositor/compositor_api/qwaylandquickcompositor.cpp')
-rw-r--r-- | src/compositor/compositor_api/qwaylandquickcompositor.cpp | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickcompositor.cpp b/src/compositor/compositor_api/qwaylandquickcompositor.cpp index 983c390f5..e8ff9c927 100644 --- a/src/compositor/compositor_api/qwaylandquickcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandquickcompositor.cpp @@ -51,7 +51,6 @@ QT_BEGIN_NAMESPACE QWaylandQuickCompositor::QWaylandQuickCompositor(QObject *parent) : QWaylandCompositor(parent) , m_initializeLegazyQmlNames(true) - , m_exposeDefaultShell(false) { } @@ -60,11 +59,6 @@ void QWaylandQuickCompositor::create() if (m_initializeLegazyQmlNames) registerLegacyQmlNames(); - if (m_exposeDefaultShell) - setExtensionFlags(extensionFlags() | QWaylandCompositor::DefaultShellExtension); - else - setExtensionFlags(extensionFlags() & !QWaylandCompositor::DefaultShellExtension); - QWaylandCompositor::create(); } @@ -92,18 +86,6 @@ void QWaylandQuickCompositor::setInitializeLegazyQmlNames(bool init) m_initializeLegazyQmlNames = init; } -bool QWaylandQuickCompositor::exposeDefaultShell() const -{ - return m_exposeDefaultShell; -} - -void QWaylandQuickCompositor::setExposeDefaultShell(bool defaultShell) -{ - if (isCreated()) - qWarning() << Q_FUNC_INFO << "modifying exposeDefaultShell after the compositor is created is not supported"; - m_exposeDefaultShell = defaultShell; -} - QWaylandOutput *QWaylandQuickCompositor::createOutput(QWaylandOutputSpace *outputSpace, QWindow *window, const QString &manufacturer, @@ -131,9 +113,6 @@ void QWaylandQuickCompositor::classBegin() void QWaylandQuickCompositor::componentComplete() { - //if (m_exposeDefaultShell) - //addDefaultShell(); - } QT_END_NAMESPACE |