1 files changed, 3 insertions, 17 deletions
diff --git a/src/client/qwaylandscreen.cpp b/src/client/qwaylandscreen.cpp
index 8a01e366e..1be90e8e7 100644
--- a/src/client/qwaylandscreen.cpp
+++ b/src/client/qwaylandscreen.cpp
@@ -35,7 +35,6 @@
 
 #include "qwaylanddisplay_p.h"
 #include "qwaylandcursor_p.h"
-#include "qwaylandextendedoutput_p.h"
 #include "qwaylandwindow_p.h"
 
 #include <QtGui/QGuiApplication>
@@ -52,7 +51,6 @@ QWaylandScreen::QWaylandScreen(QWaylandDisplay *waylandDisplay, int version, uin
     , QtWayland::wl_output(waylandDisplay->wl_registry(), id, qMin(version, 2))
     , m_outputId(id)
     , mWaylandDisplay(waylandDisplay)
-    , mExtendedOutput(0)
     , mScale(1)
     , mDepth(32)
     , mRefreshRate(60000)
@@ -62,8 +60,6 @@ QWaylandScreen::QWaylandScreen(QWaylandDisplay *waylandDisplay, int version, uin
     , m_orientation(Qt::PrimaryOrientation)
     , mWaylandCursor(0)
 {
-    // handle case of output extension global being sent after outputs
-    createExtendedOutput();
 }
 
 QWaylandScreen::~QWaylandScreen()
@@ -118,7 +114,9 @@ QDpi QWaylandScreen::logicalDpi() const
 QList<QPlatformScreen *> QWaylandScreen::virtualSiblings() const
 {
     QList<QPlatformScreen *> list;
-    foreach (QWaylandScreen *screen, mWaylandDisplay->screens())
+    const QList<QWaylandScreen*> screens = mWaylandDisplay->screens();
+    list.reserve(screens.count());
+    foreach (QWaylandScreen *screen, screens)
         list << screen;
     return list;
 }
@@ -157,18 +155,6 @@ QPlatformCursor *QWaylandScreen::cursor() const
     return  mWaylandCursor;
 }
 
-QWaylandExtendedOutput *QWaylandScreen::extendedOutput() const
-{
-    return mExtendedOutput;
-}
-
-void QWaylandScreen::createExtendedOutput()
-{
-    QtWayland::qt_output_extension *extension = mWaylandDisplay->outputExtension();
-    if (!mExtendedOutput && extension)
-        mExtendedOutput = new QWaylandExtendedOutput(this, extension->get_extended_output(output()));
-}
-
 QWaylandScreen * QWaylandScreen::waylandScreenFromWindow(QWindow *window)
 {
     QPlatformScreen *platformScreen = QPlatformScreen::platformScreenForWindow(window);