summaryrefslogtreecommitdiff
path: root/src/webenginewidgets/api/qwebenginepage.cpp
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@theqtcompany.com>2016-04-05 15:33:38 +0200
committerAlexandru Croitor <alexandru.croitor@theqtcompany.com>2016-04-08 09:05:54 +0000
commit8b587a85efaf73082dd6522f757ea7c6d1b33aae (patch)
treeea62451e081e863c6be8216ffe4bb23fe06fc8a1 /src/webenginewidgets/api/qwebenginepage.cpp
parentd1d83b229b1a015d40fec943e7b9018053b0d59d (diff)
downloadqtwebengine-8b587a85efaf73082dd6522f757ea7c6d1b33aae.tar.gz
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>
Diffstat (limited to 'src/webenginewidgets/api/qwebenginepage.cpp')
-rw-r--r--src/webenginewidgets/api/qwebenginepage.cpp26
1 files changed, 15 insertions, 11 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)