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/api') 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 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/api') 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 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/webengine/api') 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 { -- 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 ++ 1 file changed, 2 insertions(+) (limited to 'src/webengine/api') 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 { -- 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/api') 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/api') 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 ++ 1 file changed, 2 insertions(+) (limited to 'src/webengine/api') 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. */ -- 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/api') 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