From a757568022ebefd0d83f69a20c09dcc8bdb98136 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 9 May 2016 16:10:59 +0200 Subject: Blacklist flaky QWebEnginePage::setHtmlWithImageResource test. It used to be an expected fail, then it seemed to work in 5.6, and for some reason it fails again in 5.6.1. Change-Id: I95161e001c3b8af3ea48fc284e448a2d8853e108 Reviewed-by: Peter Varga Reviewed-by: Allan Sandfeld Jensen --- tests/auto/widgets/qwebenginepage/BLACKLIST | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/auto/widgets/qwebenginepage/BLACKLIST b/tests/auto/widgets/qwebenginepage/BLACKLIST index 91858f299..ddfba2612 100644 --- a/tests/auto/widgets/qwebenginepage/BLACKLIST +++ b/tests/auto/widgets/qwebenginepage/BLACKLIST @@ -3,3 +3,6 @@ [macCopyUnicodeToClipboard] osx + +[setHtmlWithImageResource] +* -- cgit v1.2.3 From b96784cc6677bef9bd32afb7ca7e6e713114ee9f Mon Sep 17 00:00:00 2001 From: Michael Bruning Date: Wed, 4 May 2016 17:01:45 +0200 Subject: Revert marking qrc: as a local scheme It was causing a regression that broke applications that embedded JavaScript in qrc files and accessed them from other embedded JavaScript files. This is e.g. a typical pattern for applications that used QtWebChannel. This partially reverts 29f9a2fb68568208a70ba9efef0e455b50a4d3e3 Task-number: QTBUG-53108 Change-Id: I8b26395d84258b6d9aca8e0c5f07d4435617f44d Reviewed-by: Kai Koehne Reviewed-by: Allan Sandfeld Jensen Reviewed-by: Michal Klocek --- src/core/renderer/content_renderer_client_qt.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp index e53076525..3886e54a0 100644 --- a/src/core/renderer/content_renderer_client_qt.cpp +++ b/src/core/renderer/content_renderer_client_qt.cpp @@ -73,8 +73,6 @@ public: blink::WebString qrcScheme(base::ASCIIToUTF16(kQrcSchemeQt)); // mark qrc as a secure scheme (avoids deprecation warnings) blink::WebSecurityPolicy::registerURLSchemeAsSecure(qrcScheme); - // mark qrc as a local scheme (allows local access to qrc) - blink::WebSecurityPolicy::registerURLSchemeAsLocal(qrcScheme); } }; -- cgit v1.2.3 From 272a1421076191e5653607fa06f8b96baeb1159a Mon Sep 17 00:00:00 2001 From: Michael Bruning Date: Tue, 10 May 2016 13:44:25 +0200 Subject: Update chromium submodule. Includes the new fix for allowing qrc access to local files. Task-number: QTBUG-52085 Change-Id: Ifae5af52580a41f7d66429324714428694a6b65a Reviewed-by: Allan Sandfeld Jensen --- src/3rdparty | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty b/src/3rdparty index 013d1b766..19e3d1d3a 160000 --- a/src/3rdparty +++ b/src/3rdparty @@ -1 +1 @@ -Subproject commit 013d1b76695db496d13da4d69e526ce67a9a6bcc +Subproject commit 19e3d1d3af80efee4377a4e5fcb9c214dba5be4e -- cgit v1.2.3 From bdaea37070f420bea13a34081e56db1ee792d040 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 9 May 2016 11:01:18 +0200 Subject: [Simplebrowser] Fix command line option parsing. Passing just command line options to Chromium prevents loading of the initial startup url. This happens because the startup url is overridden by the last command line argument, which happens to be a Chromium option, thus an invalid URL. Fix consists in using the last command line argument as the loading url only if it can be parsed as valid url. Change-Id: I3615ef57b6eddc5098de79cba1b1ba6b6af193ef Reviewed-by: Allan Sandfeld Jensen --- examples/webenginewidgets/simplebrowser/main.cpp | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/examples/webenginewidgets/simplebrowser/main.cpp b/examples/webenginewidgets/simplebrowser/main.cpp index 761403fb5..750e7ae43 100644 --- a/examples/webenginewidgets/simplebrowser/main.cpp +++ b/examples/webenginewidgets/simplebrowser/main.cpp @@ -42,6 +42,18 @@ #include "browserwindow.h" #include +QString getCommandLineUrlArgument() +{ + const QStringList args = QCoreApplication::arguments(); + if (args.count() > 1) { + const QString lastArg = args.last(); + const bool isValidUrl = QUrl::fromUserInput(lastArg).isValid(); + if (isValidUrl) + return lastArg; + } + return QString(); +} + int main(int argc, char **argv) { QApplication app(argc, argv); @@ -50,9 +62,9 @@ int main(int argc, char **argv) BrowserWindow *window = new BrowserWindow(); Browser::instance().addWindow(window); - QStringList args = QCoreApplication::arguments(); - if (args.count() > 1) - window->loadPage(args.last()); + const QString url = getCommandLineUrlArgument(); + if (!url.isEmpty()) + window->loadPage(url); else window->loadHomePage(); -- cgit v1.2.3 From 47031c68b872718de834656601edd0f8f1931fa7 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 11 May 2016 15:29:04 +0200 Subject: Add changes file for 5.6.1 Change-Id: Ic36c55b5deaceb2a7944f33aead62c6cb31a01f9 Reviewed-by: Kai Koehne Reviewed-by: Leena Miettinen --- dist/changes-5.6.1 | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 dist/changes-5.6.1 diff --git a/dist/changes-5.6.1 b/dist/changes-5.6.1 new file mode 100644 index 000000000..5a568bda9 --- /dev/null +++ b/dist/changes-5.6.1 @@ -0,0 +1,65 @@ +Qt 5.6.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.6.0. + +Qt 5.6 introduces many new features and improvements as well as bugfixes +over the 5.5.x series. For more details, refer to the online documentation +included in this distribution. The documentation is also available online: + + http://doc.qt.io/qt-5/index.html + +The Qt version 5.6 series is binary compatible with the 5.5.x series. +Applications compiled for 5.5 will continue to run with 5.6. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* General * +**************************************************************************** + + - Chromium Snapshot: + * Security fixes from Chromium up to version 50.0.2661.94 + * [QTBUG-52602] Fixed devtools so it works with newer Chrome releases. + * [QTBUG-52085, QTBUG-53108] qrc urls can now load local files. + + - QtWebEngineCore: + * [QTBUG-52124] Fixed crashes due to multithreaded use of qputenv. + * [QTBUG-52216] Fixed access of labels of MediaStream tracks. + * [QTBUG-52715] Fixed copying images to clipboard. + * [QTBUG-51789] Fixed crashes when instantiating QCoreApplication. + * [QTBUG-52121] Ensured cookies are flushed to disk on exit. + * Fixed numerous race-conditions when changing profile settings and using + custom URL scheme handlers. + + - WebEnginePage: + * [QTBUG-48995] Stopped triggering extra urlChanged signals. + * [QTBUG-51319] Accepted certificate errors are now remembered correctly. + * [QTBUG-51851, QTBUG-51969] Fixed zoom behavior. + * [QTBUG-53033] Reset the selected text of a page when setHtml is called. + * Fixed memory leak in standardContextMenu() + + +**************************************************************************** +* Platform Specific Changes * +**************************************************************************** + + - Linux: + * NSS is now only used for certificate handling. BoringSSL is used + for SSL encryption like on OS X and Windows. + * [QTBUG-48298] Fixed compilation against old Linux kernel headers. + + - Windows: + * [QTBUG-51920] Fixed building on Japanese Windows. + * [QTBUG-50252] Fixed doubled characters when using IME. + * [QTBUG-51971] Fixed CommandLine initialization. + * [QTBUG-51847] Fixed compilation issue with moc. + * [QTBUG-46720] Added support for linking to QtWebEngine from a plugin. + + - OS X: + * [QTBUG-51939] Fixed QtWebEngineProcess not being found after + macdeployqt is used. -- cgit v1.2.3