diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-12 11:32:02 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-12 11:35:45 +0100 |
| commit | a077399f4c17f57e911334867c918cc6ddeb15fc (patch) | |
| tree | c8e4d326d7a074e9d16b68399ecc5f728f8533fe /src/webenginewidgets/doc | |
| parent | 3d698f5de377bde2293e222536bc50171cfdf1b8 (diff) | |
| parent | 12dd6ff845656eb625e2ee3d0e73392bc2c61983 (diff) | |
Merge branch '5.6' into dev
Change-Id: I4272eb59cac08c69eaa58dd4d94debf1b8c5cf78
Diffstat (limited to 'src/webenginewidgets/doc')
| -rw-r--r-- | src/webenginewidgets/doc/src/qtwebkitportingguide.qdoc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/webenginewidgets/doc/src/qtwebkitportingguide.qdoc b/src/webenginewidgets/doc/src/qtwebkitportingguide.qdoc index 1f3e618c2..ca1309718 100644 --- a/src/webenginewidgets/doc/src/qtwebkitportingguide.qdoc +++ b/src/webenginewidgets/doc/src/qtwebkitportingguide.qdoc @@ -35,7 +35,6 @@ \l{http://doc.qt.io/archives/qt-5.3/qml-qtwebkit-webview.html}{QWebView API} to use the \l{Qt WebEngine} QWebEngineView. - \section1 Class Names The Qt WebEngine equivalent of Qt WebKit C++ classes are prefixed by @@ -199,6 +198,8 @@ connect(&page, SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*)), this, SLOT(authenticate(QNetworkReply*,QAuthenticator*))); \endcode + This also affects the way in which certificates are managed. For more information, see + \l {Managing Certificates}. \section1 Notes About Individual Methods @@ -264,7 +265,8 @@ \li The Web SQL Database feature that this API was wrapping in Qt WebKit was dropped from the HTML5 standard. \row - \li QWebPluginFactory, QWebPage::setPalette, QWebView::setRenderHints + \li QWebPluginDatabase, QWebPluginFactory, QWebPluginInfo, QWebPage::setPalette, + QWebView::setRenderHints \li Qt WebEngine renders web pages using Skia and is not using QPainter or Qt for this purpose. The HTML5 standard also now offers much better alternatives that were not available when native controls @@ -272,5 +274,10 @@ \row \li QWebHistoryInterface \li Visited links are persisted automatically by Qt WebEngine. + \row + \li QWebPage::setContentEditable + \li In the latest HTML standard, any document element can be made editable through the + \c contentEditable attribute. So \c runJavaScript is all that is needed: + \c{page->runJavascript("document.documentElement.contentEditable = true")} \endtable */ |