1 files changed, 7 insertions, 6 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickitem_p.h b/src/compositor/compositor_api/qwaylandquickitem_p.h
index fc69fe09c..fe8fbfd12 100644
--- a/src/compositor/compositor_api/qwaylandquickitem_p.h
+++ b/src/compositor/compositor_api/qwaylandquickitem_p.h
@@ -66,11 +66,11 @@ class QWaylandBufferMaterialShader : public QSGMaterialShader
 public:
     QWaylandBufferMaterialShader(QWaylandBufferRef::BufferFormatEgl format);
 
-    void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect) Q_DECL_OVERRIDE;
-    char const *const *attributeNames() const Q_DECL_OVERRIDE;
+    void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect) override;
+    char const *const *attributeNames() const override;
 
 protected:
-    void initialize() Q_DECL_OVERRIDE;
+    void initialize() override;
 
 private:
     const QWaylandBufferRef::BufferFormatEgl m_format;
@@ -89,8 +89,8 @@ public:
 
     void bind();
 
-    QSGMaterialType *type() const Q_DECL_OVERRIDE;
-    QSGMaterialShader *createShader() const Q_DECL_OVERRIDE;
+    QSGMaterialType *type() const override;
+    QSGMaterialShader *createShader() const override;
 
 private:
     void setTextureParameters(GLenum target);
@@ -159,7 +159,7 @@ public:
     }
 
     bool shouldSendInputEvents() const { return view->surface() && inputEventsEnabled; }
-    int scaleFactor() const { return view->output() ? view->output()->scaleFactor() : 1; }
+    qreal scaleFactor() const;
 
     static QMutex *mutex;
 
@@ -178,6 +178,7 @@ public:
     QQuickWindow *connectedWindow;
     QWaylandSurface::Origin origin;
     QPointer<QObject> subsurfaceHandler;
+    QVector<QWaylandSeat *> touchingSeats;
 };
 
 QT_END_NAMESPACE