Fix recentlyAudible Widgets and Quick API.

Rename all uses of wasRecentlyAudible to recentlyAudible.
Add missing recentlyAudible properties.
Change QtQuick slots to simple functions.
Change affected demobrowser example.
Adjust documentation for the API.

Change-Id: I5a6f7b8384c0b7e34afaa5c412a5543c210d3ef9
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>

3 files changed, 19 insertions, 14 deletions

diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index 341c4724d..0a27a3938 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -172,10 +172,10 @@ void QWebEnginePagePrivate::selectionChanged()
     Q_EMIT q->selectionChanged();
 }
 
-void QWebEnginePagePrivate::wasRecentlyAudibleChanged(bool wasRecentlyAudible)
+void QWebEnginePagePrivate::recentlyAudibleChanged(bool recentlyAudible)
 {
     Q_Q(QWebEnginePage);
-    Q_EMIT q->wasRecentlyAudibleChanged(wasRecentlyAudible);
+    Q_EMIT q->recentlyAudibleChanged(recentlyAudible);
 }
 
 QRectF QWebEnginePagePrivate::viewportRect() const
@@ -566,14 +566,14 @@ QWebEnginePage::QWebEnginePage(QObject* parent)
 */
 
 /*!
-    \fn void QWebEnginePage::wasRecentlyAudibleChanged(bool wasRecentlyAudible);
+    \fn void QWebEnginePage::recentlyAudibleChanged(bool recentlyAudible);
     \since 5.7
 
-    This signal is emitted when the page's audible state, \a wasRecentlyAudible, changes, because
+    This signal is emitted when the page's audible state, \a recentlyAudible, changes, because
     the audio is played or stopped.
 
     \note The signal is also emitted when calling the setAudioMuted() method.
-    Also, if the audio is paused, this signal is emitted with an approximate \e {two-second
+    Also, if the audio is paused, this signal is emitted with an approximate \b{two-second
     delay}, from the moment the audio is paused.
 */
 
@@ -721,6 +721,7 @@ void QWebEnginePage::setBackgroundColor(const QColor &color)
     \since 5.7
 
     The default value is \c false.
+    \sa recentlyAudible
 */
 bool QWebEnginePage::isAudioMuted() const {
     const Q_D(QWebEnginePage);
@@ -736,17 +737,20 @@ void QWebEnginePage::setAudioMuted(bool muted) {
     }
 }
 
+
 /*!
+    \property QWebEnginePage::recentlyAudible
+    \brief the current page's \e {audible state}, that is, whether audio was recently played
+    or not.
     \since 5.7
-    \sa wasRecentlyAudibleChanged()
 
-    Returns the current page's \e {audible state}, that is, whether audio was recently played
-    or not.
+    The default value is \c false.
+    \sa audioMuted
 */
-bool QWebEnginePage::wasRecentlyAudible()
+bool QWebEnginePage::recentlyAudible() const
 {
-    Q_D(QWebEnginePage);
-    return d->adapter->wasRecentlyAudible();
+    const Q_D(QWebEnginePage);
+    return d->adapter->recentlyAudible();
 }
 
 void QWebEnginePage::setView(QWidget *view)
diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h
index 0faa385da..bc6d101a1 100644
--- a/src/webenginewidgets/api/qwebenginepage.h
+++ b/src/webenginewidgets/api/qwebenginepage.h
@@ -79,6 +79,7 @@ class QWEBENGINEWIDGETS_EXPORT QWebEnginePage : public QObject {
     Q_PROPERTY(QSizeF contentsSize READ contentsSize NOTIFY contentsSizeChanged)
     Q_PROPERTY(QPointF scrollPosition READ scrollPosition NOTIFY scrollPositionChanged)
     Q_PROPERTY(bool audioMuted READ isAudioMuted WRITE setAudioMuted NOTIFY audioMutedChanged)
+    Q_PROPERTY(bool recentlyAudible READ recentlyAudible NOTIFY recentlyAudibleChanged)
 
 public:
     enum WebAction {
@@ -269,7 +270,7 @@ public:
 
     bool isAudioMuted() const;
     void setAudioMuted(bool muted);
-    bool wasRecentlyAudible();
+    bool recentlyAudible() const;
 
     void printToPdf(const QString &filePath, const QPageLayout &layout);
 #ifdef Q_QDOC
@@ -308,7 +309,7 @@ Q_SIGNALS:
     void scrollPositionChanged(const QPointF &position);
     void contentsSizeChanged(const QSizeF &size);
     void audioMutedChanged(bool muted);
-    void wasRecentlyAudibleChanged(bool wasRecentlyAudible);
+    void recentlyAudibleChanged(bool recentlyAudible);
 
 protected:
     virtual QWebEnginePage *createWindow(WebWindowType type);
diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
index de7d35354..58515bfbe 100644
--- a/src/webenginewidgets/api/qwebenginepage_p.h
+++ b/src/webenginewidgets/api/qwebenginepage_p.h
@@ -88,7 +88,7 @@ public:
     virtual void loadProgressChanged(int progress) Q_DECL_OVERRIDE;
     virtual void didUpdateTargetURL(const QUrl&) Q_DECL_OVERRIDE;
     virtual void selectionChanged() Q_DECL_OVERRIDE;
-    virtual void wasRecentlyAudibleChanged(bool wasRecentlyAudible) Q_DECL_OVERRIDE;
+    virtual void recentlyAudibleChanged(bool recentlyAudible) Q_DECL_OVERRIDE;
     virtual QRectF viewportRect() const Q_DECL_OVERRIDE;
     virtual qreal dpiScale() const Q_DECL_OVERRIDE;
     virtual QColor backgroundColor() const Q_DECL_OVERRIDE;