diff options
| -rw-r--r-- | dist/changes-5.6.1 | 65 | ||||
| -rw-r--r-- | examples/webenginewidgets/simplebrowser/main.cpp | 18 | ||||
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/core/renderer/content_renderer_client_qt.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/widgets/qwebenginepage/BLACKLIST | 3 |
5 files changed, 83 insertions, 5 deletions
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. 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 <QApplication> +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(); diff --git a/src/3rdparty b/src/3rdparty -Subproject 013d1b76695db496d13da4d69e526ce67a9a6bc +Subproject 19e3d1d3af80efee4377a4e5fcb9c214dba5be4 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); } }; 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] +* |