summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@theqtcompany.com>2015-08-26 17:07:17 +0200
committerJørgen Lind <jorgen.lind@theqtcompany.com>2015-08-28 13:10:33 +0200
commit3e6a3095142fc656c052f6e18a113ea4b140ab09 (patch)
treebfa313f2eac72e7d185c5fa66e8742376ed1fb0b
parentd2d70779224b067f6035f431319036054272ce65 (diff)
Remove followRequestedPosition from QWaylandQuickItem
since it is not needed anymore, and it is trivial to modify QWaylandQuickItem in qml to have this behavior as pure-qml's Chrome.qml shows Change-Id: I795881fde4ecf3e2ec877222e7283b1052b7c27a
-rw-r--r--examples/wayland/pure-qml/qml/main.qml1
-rw-r--r--src/compositor/compositor_api/qwaylandquickitem.cpp15
-rw-r--r--src/compositor/compositor_api/qwaylandquickitem.h6
3 files changed, 0 insertions, 22 deletions
diff --git a/examples/wayland/pure-qml/qml/main.qml b/examples/wayland/pure-qml/qml/main.qml
index 121cb0d2a..30c7a63bf 100644
--- a/examples/wayland/pure-qml/qml/main.qml
+++ b/examples/wayland/pure-qml/qml/main.qml
@@ -62,7 +62,6 @@ WaylandCompositor {
onShellSurfaceCreated: {
var item = chromeComponent.createObject(primarySurfacesArea);
item.surface = surface;
- item.followRequestedPosition = true;
shellSurface.view = item.view;
}
diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp
index efc1bec08..d02b505b0 100644
--- a/src/compositor/compositor_api/qwaylandquickitem.cpp
+++ b/src/compositor/compositor_api/qwaylandquickitem.cpp
@@ -127,7 +127,6 @@ QWaylandQuickItem::QWaylandQuickItem(QQuickItem *parent)
, m_paintEnabled(true)
, m_touchEventsEnabled(false)
, m_resizeSurfaceToItem(false)
- , m_followRequestedPos(true)
, m_inputEventsEnabled(true)
, m_newTexture(false)
, m_connectedWindow(Q_NULLPTR)
@@ -412,20 +411,6 @@ void QWaylandQuickItem::updateSize()
}
}
-
-bool QWaylandQuickItem::followRequestedPosition() const
-{
- return m_followRequestedPos;
-}
-
-void QWaylandQuickItem::setFollowRequestedPosition(bool follow)
-{
- if (m_followRequestedPos != follow) {
- m_followRequestedPos = follow;
- emit followRequestedPositionChanged();
- }
-}
-
void QWaylandQuickItem::syncGraphicsState()
{
diff --git a/src/compositor/compositor_api/qwaylandquickitem.h b/src/compositor/compositor_api/qwaylandquickitem.h
index 93fa276dc..1fb8f45bb 100644
--- a/src/compositor/compositor_api/qwaylandquickitem.h
+++ b/src/compositor/compositor_api/qwaylandquickitem.h
@@ -65,7 +65,6 @@ class Q_COMPOSITOR_EXPORT QWaylandQuickItem : public QQuickItem
Q_PROPERTY(bool touchEventsEnabled READ touchEventsEnabled WRITE setTouchEventsEnabled NOTIFY touchEventsEnabledChanged)
Q_PROPERTY(QWaylandSurface::Origin origin READ origin NOTIFY originChanged)
Q_PROPERTY(bool resizeSurfaceToItem READ resizeSurfaceToItem WRITE setResizeSurfaceToItem NOTIFY resizeSurfaceToItemChanged)
- Q_PROPERTY(bool followRequestedPosition READ followRequestedPosition WRITE setFollowRequestedPosition NOTIFY followRequestedPositionChanged)
Q_PROPERTY(bool inputEventsEnabled READ inputEventsEnabled WRITE setInputEventsEnabled NOTIFY inputEventsEnabledChanged)
public:
@@ -93,9 +92,6 @@ public:
bool inputEventsEnabled() const { return m_inputEventsEnabled; }
void setInputEventsEnabled(bool enabled);
- bool followRequestedPosition() const;
- void setFollowRequestedPosition(bool follow);
-
Q_INVOKABLE void syncGraphicsState();
protected:
@@ -132,7 +128,6 @@ Q_SIGNALS:
void originChanged();
void resizeSurfaceToItemChanged();
void surfaceDestroyed();
- void followRequestedPositionChanged();
void inputEventsEnabledChanged();
protected:
@@ -151,7 +146,6 @@ private:
bool m_paintEnabled;
bool m_touchEventsEnabled;
bool m_resizeSurfaceToItem;
- bool m_followRequestedPos;
bool m_inputEventsEnabled;
bool m_newTexture;