Merge branch '5.5' into 5.6

Change-Id: Idafba4d47393638cfc72fd02be092b67bb8cbd8c

1 files changed, 0 insertions, 22 deletions

diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 8d0bddea6..65b98ca98 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -785,15 +785,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
 {
@@ -1031,19 +1022,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);