From 7bb7eb7f96ab901dc0770356588088947bc3e627 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 22 Apr 2016 17:01:03 +0200 Subject: Update Chromium 619d606 Fix Linux kernel lacking V4L2_CID_POWER_LINE_FREQUENCY_AUTO 91e1486 Fix Linux kernel lacking v4l2 multi-planar support Task-number: QTBUG-48298 Change-Id: I3fac1dcb04ecc17cdafccbe9add30d446641c83e Reviewed-by: Allan Sandfeld Jensen --- src/3rdparty | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/3rdparty b/src/3rdparty index 8252b18aa..619d606a5 160000 --- a/src/3rdparty +++ b/src/3rdparty @@ -1 +1 @@ -Subproject commit 8252b18aa3efa52138e91f9756945afb142a1c8c +Subproject commit 619d606a504a24d46ffc5a43ca35ced96257e461 -- cgit v1.2.3 From 55f4e7c382093227aa8d43d396a5b216d732e655 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 25 Apr 2016 17:19:40 +0200 Subject: Add missing icon and text for ReloadAndBypassCache We were not handling this enum value. Change-Id: Ib44b9e42c8b9589513091d2f47c79623416ec358 Reviewed-by: Joerg Bornemann --- src/webenginewidgets/api/qwebenginepage.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 4bd1a17a3..b4a821faa 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -648,6 +648,10 @@ QAction *QWebEnginePage::action(WebAction action) const text = tr("Reload"); icon = style->standardIcon(QStyle::SP_BrowserReload); break; + case ReloadAndBypassCache: + text = tr("Reload and Bypass Cache"); + icon = style->standardIcon(QStyle::SP_BrowserReload); + break; case Cut: text = tr("Cut"); break; -- cgit v1.2.3 From b52dd27d8544706f7fd03a716f3d41cbc4974b4b Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 28 Apr 2016 08:57:30 +0200 Subject: Fix hint to use WEBENGINE_CONFIG+= At least on Windows/cmd.exe you can't put spaces in the argument. Change-Id: I55767a23409403b695e225339f86daae2dea1dc4 Reviewed-by: Allan Sandfeld Jensen --- src/webengine/doc/src/qtwebengine-platform-notes.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc index 64bfba054..9bd56b0e4 100644 --- a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc +++ b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc @@ -134,7 +134,7 @@ codecs can be enabled by passing the following option to qmake: \code - qmake WEBENGINE_CONFIG += use_proprietary_codecs + qmake WEBENGINE_CONFIG+=use_proprietary_codecs \endcode \warning When distributing proprietary codec libraries, you must acquire licenses for them. -- cgit v1.2.3 From f77cd97cacd1603fdca0c3fda405d351a1ccda93 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 26 Apr 2016 09:44:30 +0200 Subject: Avoid default cases Prefer to list all enums to handling defaults, this makes it easier to catch missing cases in the future. Change-Id: Idae2f445bd907f62202a6b68da0d030e21863afe Reviewed-by: Alexandru Croitor Reviewed-by: Kai Koehne --- src/webenginewidgets/api/qwebenginepage.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index b4a821faa..7795cc41d 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -724,7 +724,9 @@ QAction *QWebEnginePage::action(WebAction action) const case RequestClose: text = tr("Close Page"); break; - default: + case NoWebAction: + case WebActionCount: + Q_UNREACHABLE(); break; } @@ -897,8 +899,11 @@ void QWebEnginePage::triggerAction(WebAction action, bool) case RequestClose: d->adapter->requestClose(); break; - default: + case NoWebAction: + break; + case WebActionCount: Q_UNREACHABLE(); + break; } } @@ -954,11 +959,10 @@ bool QWebEnginePagePrivate::contextMenuRequested(const WebEngineContextMenuData QMenu::exec(view->actions(), event.globalPos(), 0, view); break; } - // fall through - default: + // fallthrough + case Qt::NoContextMenu: event.ignore(); return false; - break; } view->d_func()->m_pendingContextMenuEvent = false; return true; @@ -1007,8 +1011,6 @@ void QWebEnginePagePrivate::javascriptDialog(QSharedPointertitle(), controller->message(), QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes); break; - default: - Q_UNREACHABLE(); } if (accepted) controller->accept(); @@ -1173,7 +1175,7 @@ void QWebEnginePage::setFeaturePermission(const QUrl &securityOrigin, QWebEngine else d->adapter->grantMouseLockPermission(false); break; - default: + case Notifications: break; } } @@ -1339,7 +1341,6 @@ QStringList QWebEnginePage::chooseFiles(FileSelectionMode mode, const QStringLis if (!str.isNull()) ret << str; break; - default: case FilePickerController::Open: str = QFileDialog::getOpenFileName(view(), QString(), oldFiles.first()); if (!str.isNull()) -- cgit v1.2.3 From a8564cc6fb40fe6a9c3f5f6f37392a628aa5b685 Mon Sep 17 00:00:00 2001 From: Corentin Jabot Date: Wed, 16 Dec 2015 10:18:30 +0100 Subject: Never call QtWebEngine::initialize from DllMain MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On windows, calling QtWebEngine::initialize from DllMain may crash, depending on what QPA backend is used. We make sure to only add a qAddPreRoutine initializing QtWebEngine if there is no instance of QCoreApplication. By doing so, we support linking to QtWebEngineWidget from a plugin, while still initializing the WebEngine automatically when linked to the main application binary. Task-number: QTBUG-46720 Reviewed-by: Jocelyn Turcotte (Woboq GmbH) (cherry picked from commit 6a8d99ab00ace2084820547572dc05ac8ad2bc5a) Change-Id: Id3b2c1e21e01808cef124f8ece6b247b1ba613cb Reviewed-by: Michael Brüning --- src/core/api/qtwebenginecoreglobal.cpp | 5 +++++ src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp | 17 +++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/core/api/qtwebenginecoreglobal.cpp b/src/core/api/qtwebenginecoreglobal.cpp index 0e857d7d9..e60e6139e 100644 --- a/src/core/api/qtwebenginecoreglobal.cpp +++ b/src/core/api/qtwebenginecoreglobal.cpp @@ -75,6 +75,11 @@ QWEBENGINE_PRIVATE_EXPORT void initialize() qFatal("QtWebEngine::initialize() must be called after the construction of the application object."); return; } + + // Bail out silently if the user did not construct a QGuiApplication. + if (!qobject_cast(app)) + return; + if (app->thread() != QThread::currentThread()) { qFatal("QtWebEngine::initialize() must be called from the Qt gui thread."); return; diff --git a/src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp b/src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp index 263376e45..5ebb8b546 100644 --- a/src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp +++ b/src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp @@ -36,7 +36,7 @@ #include "qtwebenginewidgetsglobal.h" -#include +#include namespace QtWebEngineCore { @@ -46,13 +46,18 @@ namespace QtWebEngineCore QT_BEGIN_NAMESPACE static void initialize() { - // Bail out silently if the user did not construct a QGuiApplication. - if (!qobject_cast(QCoreApplication::instance())) + //On window/ANGLE, calling QtWebEngine::initialize from DllMain will result in a crash. + //To ensure it doesn't, we check that when loading the library + //QCoreApplication is not yet instantiated, ensuring the call will be deferred +#if defined(Q_OS_WIN) + if (QCoreApplication::instance() + && QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGLES) { return; - - QtWebEngineCore::initialize(); + } +#endif + qAddPreRoutine(QtWebEngineCore::initialize); } -Q_COREAPP_STARTUP_FUNCTION(initialize) +Q_CONSTRUCTOR_FUNCTION(initialize) QT_END_NAMESPACE -- cgit v1.2.3 From 8575d9aa489f4c9e839e3cb28b9f8c27acbdb425 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 25 Apr 2016 17:12:00 +0200 Subject: Update chromium Pulls in fix for race condition in URLRequestRedirectJob. Task-number: QTBUG-52200 Change-Id: I43b822c87501e28ff3cd4a71513ec79712b726c0 Reviewed-by: Allan Sandfeld Jensen --- src/3rdparty | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/3rdparty b/src/3rdparty index 619d606a5..51f408a81 160000 --- a/src/3rdparty +++ b/src/3rdparty @@ -1 +1 @@ -Subproject commit 619d606a504a24d46ffc5a43ca35ced96257e461 +Subproject commit 51f408a8190c9c890f1ceb89e46aa9ba4a34c32f -- cgit v1.2.3