diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-08-26 13:44:45 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-09-07 10:30:56 +0000 |
| commit | dc16cdd60449112343d43852960142db7fd155fd (patch) | |
| tree | 40b1166c0448fc168bd0ac010ae2898f29b57ec1 /src/webengine/api | |
| parent | 003924d46e5f886eca1fa3fd220e3d1b652322fb (diff) | |
Update WebEngineView documentation
The split suggested in the comment does not work: You have to keep the
complete documentation for a QML type in one file, the documentation
bits in qquickwebengineview.cpp were silently ignored so far.
This change moves over the bits from .cpp , adds missing documentation
for new elements and sanitizes the output of others.
Task-number: QTBUG-47909
Change-Id: Ie1ebb5a9fe952c7a76c8fe1b67135614ca90ce7a
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Diffstat (limited to 'src/webengine/api')
| -rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index 7405cae44..6c3452a6a 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -705,15 +705,6 @@ void QQuickWebEngineView::setProfile(QQuickWebEngineProfile *profile) Q_D(QQuickWebEngineView); d->setProfile(profile); } -/*! - * \qmlproperty WebEngineSettings QQuickWebEngineView::settings - * \readonly settings - * \since QtWebEngine 1.1 - * - * The \a settings property holds the settings used by this view. - * - * \sa WebEngineSettings - */ QQuickWebEngineSettings *QQuickWebEngineView::settings() const { @@ -903,19 +894,6 @@ QQuickWebEngineHistory *QQuickWebEngineView::navigationHistory() const return d->m_history.data(); } -/*! - * \qmlproperty QQmlWebChannel WebEngineView::webChannel - * \since QtWebEngine 1.1 - * - * The web channel instance used by this view. - * This channel is automatically using the internal QtWebEngine transport mechanism over Chromium IPC, - * and exposed in the javascript context of the page it is rendering as \c qt.webChannelTransport. - * This transport object is used when instantiating the JavaScript counterpart of QWebChannel using - * the \l{Qt WebChannel JavaScript API}. - * - * \note The view does not take ownership when explicitly setting a webChannel object. - */ - QQmlWebChannel *QQuickWebEngineView::webChannel() { Q_D(QQuickWebEngineView); |