From 29ad7a1476a4aab77477e59b0bba538a8371b264 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 21 Mar 2016 15:18:27 +0100 Subject: Doc: Attribute, not flag, can be used for initialization The Qt::AA_ShareOpenGLContexts attribute can be used to set up an OpenGL Context, instead of passing it in the constructor. Task-number: QTBUG-51379 Change-Id: I46bcb07fc69c0b8e7ac9bf632d328c15dca2ea45 Reviewed-by: Kai Koehne --- src/webengine/api/qtwebengineglobal.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/webengine') diff --git a/src/webengine/api/qtwebengineglobal.cpp b/src/webengine/api/qtwebengineglobal.cpp index 8efbc3799..c392a3c0b 100644 --- a/src/webengine/api/qtwebengineglobal.cpp +++ b/src/webengine/api/qtwebengineglobal.cpp @@ -62,8 +62,9 @@ namespace QtWebEngine { Sets up an OpenGL Context that can be shared between processes. This has to be done after QGuiApplication is created, but before a Qt Quick window is created. - This has the same effect as passing Qt::AA_ShareOpenGLContexts to the QGuiApplication - constructor. + This has the same effect as setting the Qt::AA_ShareOpenGLContexts + attribute with QCoreApplication::setAttribute before constructing + QGuiApplication. */ void initialize() { -- cgit v1.2.3 From f62f223b28989ee827f26969274f544c8e7d3e97 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Wed, 2 Mar 2016 11:22:11 +0100 Subject: Doc: Quote example code from the Minimal example Change-Id: I0050a0090e4e0877dc56b8c529d9cbb77a0cdd33 Reviewed-by: Kai Koehne --- src/webengine/doc/src/qtwebengine-overview.qdoc | 35 +++++-------------------- src/webengine/doc/src/webengineview.qdoc | 35 +++++-------------------- 2 files changed, 12 insertions(+), 58 deletions(-) (limited to 'src/webengine') diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc index 9dc78a736..6ec345cb0 100644 --- a/src/webengine/doc/src/qtwebengine-overview.qdoc +++ b/src/webengine/doc/src/qtwebengine-overview.qdoc @@ -164,19 +164,9 @@ engine must be initialized by using \l QtWebEngine::initialize in the application main source file, as illustrated by the following code snippet: - \code - int main(int argc, char **argv) - { - Application app(argc, argv); - - QtWebEngine::initialize(); - - QQmlApplicationEngine appEngine; - appEngine.load(QUrl("qrc:/main.qml")); - - return app.exec(); - } - \endcode + \quotefromfile webengine/minimal/main.cpp + \skipto main + \printuntil } An application can load pages into the WebEngineView, using either an URL or HTML string, and navigate within session history. By default, links to different pages load within the same @@ -186,22 +176,9 @@ The following sample QML application loads a web page using the \l{WebEngineView::}{url} property: - \qml - import QtQuick 2.1 - import QtQuick.Controls 1.1 - import QtWebEngine 1.1 - - ApplicationWindow { - width: 1280 - height: 720 - visible: true - WebEngineView { - id: webview - url: "http://www.qt.io" - anchors.fill: parent - } - } - \endqml + \quotefromfile webengine/minimal/main.qml + \skipto import + \printuntil /^\}/ \section1 Managing Certificates diff --git a/src/webengine/doc/src/webengineview.qdoc b/src/webengine/doc/src/webengineview.qdoc index fc21480ad..d2dc627a3 100644 --- a/src/webengine/doc/src/webengineview.qdoc +++ b/src/webengine/doc/src/webengineview.qdoc @@ -40,19 +40,9 @@ \l QtWebEngine::initialize in the application main source file, as illustrated by the following code snippet: - \code - int main(int argc, char **argv) - { - Application app(argc, argv); - - QtWebEngine::initialize(); - - QQmlApplicationEngine appEngine; - appEngine.load(QUrl("qrc:/main.qml")); - - return app.exec(); - } - \endcode + \quotefromfile webengine/minimal/main.cpp + \skipto main + \printuntil } \section2 Loading Web Pages @@ -62,22 +52,9 @@ The following sample QML application loads a web page using the \c url property: - \qml - import QtQuick 2.1 - import QtQuick.Controls 1.1 - import QtWebEngine 1.1 - - ApplicationWindow { - width: 1280 - height: 720 - visible: true - WebEngineView { - id: webview - url: "http://www.qt.io" - anchors.fill: parent - } - } - \endqml + \quotefromfile webengine/minimal/main.qml + \skipto import + \printuntil /^\}/ The \l loadingChanged() signal is emitted when loading a page begins, ends, or fails. The \l loading property holds whether the HTML page is currently loading and the load status is -- cgit v1.2.3 From fab5cff1171de54f43d9ab57ed16f8d0f85b433e Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Tue, 1 Mar 2016 16:21:49 +0100 Subject: Doc: Improve docs for the zoomFactor property In the WebEngineView type and QWebEnginePage and QWebEngineView docs. Change-Id: Ibbabcf6cc38a48fb14abb105f5fda4c03a89ccba Reviewed-by: Kai Koehne --- src/webengine/doc/src/webengineview.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/webengine') diff --git a/src/webengine/doc/src/webengineview.qdoc b/src/webengine/doc/src/webengineview.qdoc index d2dc627a3..da0df4d9e 100644 --- a/src/webengine/doc/src/webengineview.qdoc +++ b/src/webengine/doc/src/webengineview.qdoc @@ -62,7 +62,7 @@ The title of an HTML page can be accessed with the \l title property. Additionally, a web page may specify an icon, which can be accessed using the \l icon property. The \l zoomFactor - property holds the overall size of the contents of the web page. + property enables zooming the contents of the web page by a scale factor. If a certificate error is raised while loading a web page, the \l certificateError() signal is emitted. Certificate errors are handled by using the methods of the WebEngineCertificateError -- cgit v1.2.3 From 963f90b7a07236d81d7bb65798c641556501ab10 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Wed, 2 Mar 2016 13:21:18 +0100 Subject: Doc: Restructure paragraph about loading pages Describe the "loading" property first and remove the "LoadStatus" enumeration. Change-Id: I2357c604197c305e9cd2d3ff7dd322949b1b9e4b Reviewed-by: Kai Koehne --- src/webengine/doc/src/webengineview.qdoc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/webengine') diff --git a/src/webengine/doc/src/webengineview.qdoc b/src/webengine/doc/src/webengineview.qdoc index da0df4d9e..574b5e70f 100644 --- a/src/webengine/doc/src/webengineview.qdoc +++ b/src/webengine/doc/src/webengineview.qdoc @@ -56,9 +56,8 @@ \skipto import \printuntil /^\}/ - The \l loadingChanged() signal is emitted when loading a page begins, ends, or fails. The - \l loading property holds whether the HTML page is currently loading and the load status is - reflected in the \l LoadStatus property. + The \l loading property holds whether an HTML page is currently loading. + The \l loadingChanged() signal is emitted when loading the page begins, ends, or fails. The title of an HTML page can be accessed with the \l title property. Additionally, a web page may specify an icon, which can be accessed using the \l icon property. The \l zoomFactor -- cgit v1.2.3 From b6dc12bbb5059441363dcea3bcae94d17da482ec Mon Sep 17 00:00:00 2001 From: Szabolcs David Date: Tue, 14 Jul 2015 02:37:26 -0700 Subject: Move loadVisuallyCommitted signal to the test support API Change-Id: I877bbd8bc5c710370f135a27bcd7f0f7c95a7292 Reviewed-by: Joerg Bornemann --- src/webengine/api/qquickwebenginetestsupport_p.h | 1 + src/webengine/api/qquickwebengineview.cpp | 5 ++++- src/webengine/api/qquickwebengineview_p_p.h | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src/webengine') diff --git a/src/webengine/api/qquickwebenginetestsupport_p.h b/src/webengine/api/qquickwebenginetestsupport_p.h index d4b50ac2d..8ea023b63 100644 --- a/src/webengine/api/qquickwebenginetestsupport_p.h +++ b/src/webengine/api/qquickwebenginetestsupport_p.h @@ -81,6 +81,7 @@ public: Q_SIGNALS: void validationMessageShown(const QString &mainText, const QString &subText); void windowCloseRejected(); + void loadVisuallyCommitted(); private: QScopedPointer m_errorPage; diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index 25c4d28ed..066a45d07 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -420,7 +420,10 @@ void QQuickWebEngineViewPrivate::loadCommitted() void QQuickWebEngineViewPrivate::loadVisuallyCommitted() { - Q_EMIT e->loadVisuallyCommitted(); +#ifdef ENABLE_QML_TESTSUPPORT_API + if (m_testSupport) + Q_EMIT m_testSupport->loadVisuallyCommitted(); +#endif } Q_STATIC_ASSERT(static_cast(WebEngineError::NoErrorDomain) == static_cast(QQuickWebEngineView::NoErrorDomain)); diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h index dbbbf9168..65059c837 100644 --- a/src/webengine/api/qquickwebengineview_p_p.h +++ b/src/webengine/api/qquickwebengineview_p_p.h @@ -101,7 +101,6 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineViewExperimental : public QObjec Q_SIGNALS: void extraContextMenuEntriesComponentChanged(); - void loadVisuallyCommitted(); private: QQuickWebEngineViewExperimental(QQuickWebEngineViewPrivate* viewPrivate); -- cgit v1.2.3 From f66c8894268e25d58f7a405914f81595ce6ac8c1 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Tue, 29 Mar 2016 14:16:09 +0200 Subject: Doc: Fix documentation about cookie stores Remove misleading "singleton, if one has been set" from the accessor's documentation. Also link to the accessor's from the class documentation, and remove mentioning of cookie store as something that can be accessed for an individual page. Finally, mark QWebEngineProfile::cookieStore as new in Qt 5.6. Change-Id: Ia20ca0ef45a9a15de0052f7ceb7f59d454c70fdc Reviewed-by: Florian Bruhin Reviewed-by: Leena Miettinen --- src/webengine/api/qquickwebengineprofile.cpp | 2 +- src/webengine/doc/src/qtwebengine-overview.qdoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/webengine') diff --git a/src/webengine/api/qquickwebengineprofile.cpp b/src/webengine/api/qquickwebengineprofile.cpp index 3284d8491..c522ef1ea 100644 --- a/src/webengine/api/qquickwebengineprofile.cpp +++ b/src/webengine/api/qquickwebengineprofile.cpp @@ -592,7 +592,7 @@ QQuickWebEngineProfile *QQuickWebEngineProfile::defaultProfile() } /*! - Returns the cookie store singleton, if one has been set. + Returns the cookie store for this profile. */ QWebEngineCookieStore *QQuickWebEngineProfile::cookieStore() const { diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc index 6ec345cb0..1ac7710a9 100644 --- a/src/webengine/doc/src/qtwebengine-overview.qdoc +++ b/src/webengine/doc/src/qtwebengine-overview.qdoc @@ -152,7 +152,7 @@ Each QWebEnginePage belongs to a QWebEngineProfile that can have a QWebEngineSettings for specifying page settings, a QWebEngineScriptCollection for running scripts on the page, and a QWebEngineCookieStore for accessing the HTTP cookies of Chromium. A QWebEnginePage can also - directly point to a script collection or cookie store. + directly point to a script collection. \section1 Embedding Web Content into Qt Quick Applications -- cgit v1.2.3 From bc00d396585e75dcaaed5e954519723b5046e070 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 22 Feb 2016 16:08:29 +0100 Subject: OSX: Fix QSurfaceFormat check to allow < 3.2 OpenGL profiles. Currently if a < 3.2 OpenGL Compatibility profile is requested on OSX, a webengine application would crash saying that the global profile does not match the default profile. That happens because in the Cocoa QPA any requested OpenGL Compatibility profile or Core profile with version smaller than 3.2 gets reset to QSurfaceFormat::NoProfile and version 2.1. Fix consists in making sure that the QSurfaceFormat check only considers Core profile with versions >= 3.2. All other combinations would result in NoProfile 2.1 and thus not cause any issues for webengine. Change-Id: I7c9866d761c052e52389022abe8e213d062db41f Task-number: QTBUG-51058 Reviewed-by: Kai Koehne Reviewed-by: Laszlo Agocs --- src/webengine/render_widget_host_view_qt_delegate_quick.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/webengine') diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp index b667bbc5c..3ba3d117e 100644 --- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp +++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp @@ -63,14 +63,19 @@ RenderWidgetHostViewQtDelegateQuick::RenderWidgetHostViewQtDelegateQuick(RenderW setActiveFocusOnTab(true); #ifdef Q_OS_OSX - // Check that the default QSurfaceFormat OpenGL profile matches the global OpenGL shared - // context profile, otherwise this could lead to a nasty crash. + // Check that the default QSurfaceFormat OpenGL profile is compatible with the global OpenGL + // shared context profile, otherwise this could lead to a nasty crash. QOpenGLContext *globalSharedContext = QOpenGLContext::globalShareContext(); if (globalSharedContext) { QSurfaceFormat sharedFormat = globalSharedContext->format(); QSurfaceFormat defaultFormat = QSurfaceFormat::defaultFormat(); - if (defaultFormat.profile() != sharedFormat.profile()) { - qFatal("QWebEngine: Default QSurfaceFormat OpenGL profile does not match global shared context OpenGL profile. Please make sure you set a new QSurfaceFormat before the QtGui application instance is created."); + + if (defaultFormat.profile() != sharedFormat.profile() + && defaultFormat.profile() == QSurfaceFormat::CoreProfile + && defaultFormat.version() >= qMakePair(3, 2)) { + qFatal("QWebEngine: Default QSurfaceFormat OpenGL profile is not compatible with the " + "global shared context OpenGL profile. Please make sure you set a compatible " + "QSurfaceFormat before the QtGui application instance is created."); } } #endif -- cgit v1.2.3 From 004205323497bc50674133aa3c915d9284ccd266 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 1 Apr 2016 12:34:58 +0200 Subject: Doc: Link Pepper plugin platform information to respective settings Change-Id: I1bd0c58a0cee3933370238841c12cf0c1d965c93 Reviewed-by: Leena Miettinen --- src/webengine/api/qquickwebenginesettings.cpp | 2 ++ src/webengine/doc/src/qtwebengine-platform-notes.qdoc | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'src/webengine') diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp index fe421993a..58d2b681d 100644 --- a/src/webengine/api/qquickwebenginesettings.cpp +++ b/src/webengine/api/qquickwebenginesettings.cpp @@ -213,6 +213,8 @@ bool QQuickWebEngineSettings::errorPageEnabled() const Enables support for Pepper plugins, such as the Flash player. Disabled by default. + + \sa {Pepper Plugin API Support} */ bool QQuickWebEngineSettings::pluginsEnabled() const { diff --git a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc index e37817e0e..64bfba054 100644 --- a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc +++ b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc @@ -68,8 +68,12 @@ \section1 Pepper Plugin API Support - Qt WebEngine supports loading Pepper Plugin API (PPAPI) plugins. The plugins must be loaded - manually using the Chromium command line syntax with the \c --register-pepper-plugins argument. + Qt WebEngine supports loading Pepper Plugin API (PPAPI) plugins if + WebEngineSettings::pluginsEnabled or QWebEngineSettings::PluginsEnabled + is set. + + Except for the Adobe Flash Player plugin, the plugins must be loaded manually using the + Chromium command line syntax with the \c --register-pepper-plugins argument. The argument value is a list of entries, separated by commas, that contain the file path and one or several MIME types, separated by semicolons: @@ -85,8 +89,6 @@ The MIME type is important because it determines which embeds the plugin is used for. - This process has been automated for the Pepper Flash player plugin. - \section2 Pepper Flash Player Plugin Support The Pepper Flash player plugin can be loaded automatically if it is installed in one of the -- cgit v1.2.3 From 6d72c4ce5a6948d4c495b3d7560a7449a40917c0 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 4 Apr 2016 10:04:02 +0200 Subject: Doc: Replace "web engine script" with class and type names Change-Id: I644475dc966b9a0a13bba242b653d2bc2357f24b Reviewed-by: Allan Sandfeld Jensen --- src/webengine/doc/src/qtwebengine-overview.qdoc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/webengine') diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc index 1ac7710a9..c26497799 100644 --- a/src/webengine/doc/src/qtwebengine-overview.qdoc +++ b/src/webengine/doc/src/qtwebengine-overview.qdoc @@ -121,8 +121,9 @@ created is not suitable for DOM operations, where one has to wait until the DOM is ready. In addition, an injected script shares the same \e world as the other scripts executed on the - page, which might lead to conflicts. To avoid this, the Chromium API for - \e{Content Script Extensions} is implemented by \e {web engine script}. It specifies the + page, which might lead to conflicts. To avoid this, the QWebEngineScript class and the + WebEngineScript QML type provide implementations of the Chromium API for + \e{Content Script Extensions}. They specify the script to run, the injection point, and the world where the script is run. This enables accessing the DOM to manipulate it within a world. -- cgit v1.2.3 From 9da7a0649cfa65c784e86cf3496b188c9d8d15c4 Mon Sep 17 00:00:00 2001 From: Giulio Camuffo Date: Wed, 30 Mar 2016 12:54:35 +0300 Subject: Fix trying to open multiple windows if not supported We shouldn't special case some platform integration names, instead check if it supports the proper capabilities Change-Id: Ib8a28a974a4054cea4fbfb503be7c0e0f797e242 Reviewed-by: Kai Koehne --- src/webengine/api/qquickwebengineview.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/webengine') diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index 066a45d07..1e3efd6c4 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -77,6 +77,8 @@ #include #include #include +#include +#include #ifndef QT_NO_ACCESSIBILITY #include #endif // QT_NO_ACCESSIBILITY @@ -164,7 +166,7 @@ RenderWidgetHostViewQtDelegate *QQuickWebEngineViewPrivate::CreateRenderWidgetHo RenderWidgetHostViewQtDelegate *QQuickWebEngineViewPrivate::CreateRenderWidgetHostViewQtDelegateForPopup(RenderWidgetHostViewQtDelegateClient *client) { Q_Q(QQuickWebEngineView); - const bool hasWindowCapability = qApp->platformName().toLower() != QLatin1String("eglfs"); + const bool hasWindowCapability = QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::MultipleWindows); RenderWidgetHostViewQtDelegateQuick *quickDelegate = new RenderWidgetHostViewQtDelegateQuick(client, /*isPopup = */ true); if (hasWindowCapability) { RenderWidgetHostViewQtDelegateQuickWindow *wrapperWindow = new RenderWidgetHostViewQtDelegateQuickWindow(quickDelegate); -- cgit v1.2.3 From d8b5c233c10a68a7b7edbf44c22a711415ec784b Mon Sep 17 00:00:00 2001 From: Adam Kallai Date: Mon, 4 Apr 2016 10:09:08 +0200 Subject: Add missing revision tag to the mimeTypeChanged signal The mimeType property of the WebEngingeDownloadIten is tagged for REVISION 1 so the related signal should be tagged for REVISION 1 as well. Change-Id: I918de55c81779424011e42c358d5c7aeed2909ee Reviewed-by: Allan Sandfeld Jensen --- src/webengine/api/qquickwebenginedownloaditem_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/webengine') diff --git a/src/webengine/api/qquickwebenginedownloaditem_p.h b/src/webengine/api/qquickwebenginedownloaditem_p.h index 124cea1a5..a7f60199b 100644 --- a/src/webengine/api/qquickwebenginedownloaditem_p.h +++ b/src/webengine/api/qquickwebenginedownloaditem_p.h @@ -93,7 +93,7 @@ Q_SIGNALS: void stateChanged(); void receivedBytesChanged(); void totalBytesChanged(); - void mimeTypeChanged(); + Q_REVISION(1) void mimeTypeChanged(); void pathChanged(); private: -- cgit v1.2.3 From 58e26ce0fc9b04c015c450a5d2448a4cad0ddfe0 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 4 Apr 2016 10:51:01 +0200 Subject: Doc: WebEngine does not support Chromium extensions For example, @include, @match, and @exclude. Change-Id: I16d29b4e72452980e43c8e7c5702e21cccf159d5 Reviewed-by: Kai Koehne --- src/webengine/api/qquickwebenginescript.cpp | 2 ++ src/webengine/doc/src/qtwebengine-overview.qdoc | 2 ++ 2 files changed, 4 insertions(+) (limited to 'src/webengine') diff --git a/src/webengine/api/qquickwebenginescript.cpp b/src/webengine/api/qquickwebenginescript.cpp index 68ea491b3..6d698c3c6 100644 --- a/src/webengine/api/qquickwebenginescript.cpp +++ b/src/webengine/api/qquickwebenginescript.cpp @@ -62,6 +62,8 @@ using QtWebEngineCore::UserScript; not accessible from a different one. The worldId property provides some predefined IDs for this purpose. + \note Chromium extensions, such as \c @include, \c @match, and \c @exclude, are not supported. + Use \l{WebEngineView::userScripts}{WebEngineView.userScripts} to access a list of scripts attached to the web view. */ diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc index c26497799..08424f7c2 100644 --- a/src/webengine/doc/src/qtwebengine-overview.qdoc +++ b/src/webengine/doc/src/qtwebengine-overview.qdoc @@ -127,6 +127,8 @@ script to run, the injection point, and the world where the script is run. This enables accessing the DOM to manipulate it within a world. + \note Chromium extensions, such as \c @include, \c @match, and \c @exclude, are not supported. + Because the render process is separated from the GUI process, they should ideally share an OpenGL context to enable one process to access the resources uploaded by the other, such as images or textures. However, some inter-process communication is needed for safety and -- cgit v1.2.3 From 52b4dbc1e1104665b2bb6143f515a3f8aa927e79 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Tue, 5 Apr 2016 14:50:59 +0200 Subject: Revision DownloadItem.mimeType The property was already revisioned, but the signal was not. Also mark the property as new in the documentation. Change-Id: Iab50bea0d593e9dafb3e58b7f99dd5b95655a1a9 Reviewed-by: Allan Sandfeld Jensen --- src/webengine/api/qquickwebenginedownloaditem.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/webengine') diff --git a/src/webengine/api/qquickwebenginedownloaditem.cpp b/src/webengine/api/qquickwebenginedownloaditem.cpp index 2c1ec1ce9..8e5c0e160 100644 --- a/src/webengine/api/qquickwebenginedownloaditem.cpp +++ b/src/webengine/api/qquickwebenginedownloaditem.cpp @@ -218,6 +218,7 @@ qint64 QQuickWebEngineDownloadItem::receivedBytes() const /*! \qmlproperty QString WebEngineDownloadItem::mimeType + \since QtWebEngine 1.2 Holds the MIME type of the download. */ -- cgit v1.2.3