Rename automaticFrameCallbacks to automaticFrameCallback

and:
- add a signal for when it changes
- change default to true

Change-Id: Ifb7d29756f554dbd2a2594c935442ba9f4956c5c

3 files changed, 18 insertions, 11 deletions

diff --git a/examples/wayland/pure-qml/qml/main.qml b/examples/wayland/pure-qml/qml/main.qml
index bcdab7e37..66382c479 100644
--- a/examples/wayland/pure-qml/qml/main.qml
+++ b/examples/wayland/pure-qml/qml/main.qml
@@ -81,7 +81,7 @@ WaylandCompositor {
         var screen = screenComponent.createObject(0, { "compositor" : compositor } );
         primarySurfacesArea = screen.surfacesArea;
         var output = compositor.primaryOutputSpace.addOutputWindow(screen);
-        output.automaticFrameCallbacks = true;
+        output.automaticFrameCallback = true;
     }
 
     Component.onCompleted: {
diff --git a/src/compositor/compositor_api/qwaylandquickoutput.cpp b/src/compositor/compositor_api/qwaylandquickoutput.cpp
index 9a3842b07..463901572 100644
--- a/src/compositor/compositor_api/qwaylandquickoutput.cpp
+++ b/src/compositor/compositor_api/qwaylandquickoutput.cpp
@@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE
 QWaylandQuickOutput::QWaylandQuickOutput(QWaylandOutputSpace *outputSpace, QQuickWindow *window)
     : QWaylandOutput(outputSpace, window)
     , m_updateScheduled(false)
-    , m_automaticFrameCallbacks(false)
+    , m_automaticFrameCallback(true)
 {
     connect(window, &QQuickWindow::beforeSynchronizing,
             this, &QWaylandQuickOutput::updateStarted,
@@ -66,14 +66,18 @@ void QWaylandQuickOutput::update()
     }
 }
 
-bool QWaylandQuickOutput::automaticFrameCallbacks() const
+bool QWaylandQuickOutput::automaticFrameCallback() const
 {
-    return m_automaticFrameCallbacks;
+    return m_automaticFrameCallback;
 }
 
-void QWaylandQuickOutput::setAutomaticFrameCallbacks(bool automatic)
+void QWaylandQuickOutput::setAutomaticFrameCallback(bool automatic)
 {
-    m_automaticFrameCallbacks = automatic;
+    if (m_automaticFrameCallback == automatic)
+        return;
+
+    m_automaticFrameCallback = automatic;
+    automaticFrameCallbackChanged();
 }
 
 void QWaylandQuickOutput::updateStarted()
@@ -85,7 +89,7 @@ void QWaylandQuickOutput::updateStarted()
 
 void QWaylandQuickOutput::doFrameCallbacks()
 {
-    if (m_automaticFrameCallbacks)
+    if (m_automaticFrameCallback)
         sendFrameCallbacks();
 }
 QT_END_NAMESPACE
diff --git a/src/compositor/compositor_api/qwaylandquickoutput.h b/src/compositor/compositor_api/qwaylandquickoutput.h
index 5065ad196..d7e37bbe1 100644
--- a/src/compositor/compositor_api/qwaylandquickoutput.h
+++ b/src/compositor/compositor_api/qwaylandquickoutput.h
@@ -49,7 +49,7 @@ class QQuickWindow;
 class Q_COMPOSITOR_EXPORT QWaylandQuickOutput : public QWaylandOutput
 {
     Q_OBJECT
-    Q_PROPERTY(bool automaticFrameCallbacks READ automaticFrameCallbacks WRITE setAutomaticFrameCallbacks)
+    Q_PROPERTY(bool automaticFrameCallback READ automaticFrameCallback WRITE setAutomaticFrameCallback NOTIFY automaticFrameCallbackChanged)
 public:
     QWaylandQuickOutput(QWaylandOutputSpace *outputSpace, QQuickWindow *window);
 
@@ -57,17 +57,20 @@ public:
 
     void update() Q_DECL_OVERRIDE;
 
-    bool automaticFrameCallbacks() const;
-    void setAutomaticFrameCallbacks(bool automatic);
+    bool automaticFrameCallback() const;
+    void setAutomaticFrameCallback(bool automatic);
 
 public Q_SLOTS:
     void updateStarted();
 
+Q_SIGNALS:
+    void automaticFrameCallbackChanged();
+
 private:
     void doFrameCallbacks();
 
     bool m_updateScheduled;
-    bool m_automaticFrameCallbacks;
+    bool m_automaticFrameCallback;
 };
 
 QT_END_NAMESPACE