diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-03-20 22:02:30 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-03-20 22:02:30 +0000 |
| commit | 762d81d850dcc07478116af986aa3fd8db2fce19 (patch) | |
| tree | 02c97f3a14f82ac433b7c8a6d7e612e8114bdca7 | |
| parent | 30799e154333c291899cec8d9ff167755ff592c0 (diff) | |
| parent | 0f93f145008b84b5f6e266380cab1dbb2f7ab9cd (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" into refs/staging/5.13
| -rw-r--r-- | dist/changes-5.12.2 | 3 | ||||
| -rw-r--r-- | src/core/core_project.pro | 8 | ||||
| -rw-r--r-- | src/core/net/network_delegate_qt.cpp | 3 | ||||
| -rw-r--r-- | src/core/ozone/gl_surface_glx_qt.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/widgets/qwebenginepage/resources/reload.html | 8 | ||||
| -rw-r--r-- | tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp | 8 | ||||
| -rw-r--r-- | tests/auto/widgets/qwebenginepage/tst_qwebenginepage.qrc | 1 |
7 files changed, 30 insertions, 3 deletions
diff --git a/dist/changes-5.12.2 b/dist/changes-5.12.2 index ad427ecce..0f5087e55 100644 --- a/dist/changes-5.12.2 +++ b/dist/changes-5.12.2 @@ -31,7 +31,7 @@ Behavior Changes Chromium -------- - - Security fixes from Chromium up to version 72.0.3626.96, including: + - Security fixes from Chromium up to version 72.0.3626.121, including: * CVE-2019-5754 * CVE-2019-5755 * CVE-2019-5756 @@ -52,6 +52,7 @@ Chromium * CVE-2019-5782 * CVE-2019-5783 * CVE-2019-5784 + * CVE-2019-5786 * Security issue 895117 * Security issue 895970 * Security issue 899689 diff --git a/src/core/core_project.pro b/src/core/core_project.pro index 5980072ea..ecb4a3ab5 100644 --- a/src/core/core_project.pro +++ b/src/core/core_project.pro @@ -17,3 +17,11 @@ INCLUDEPATH += $$CHROMIUM_SRC_DIR \ SOURCES += $$NINJA_SOURCES HEADERS += $$NINJA_HEADERS DEFINES += $$NINJA_DEFINES + +lupdate_run { + SOURCES += clipboard_qt.cpp \ + profile_adapter_client.cpp \ + profile_adapter.cpp \ + render_view_context_menu_qt.cpp \ + web_contents_adapter.cpp +} diff --git a/src/core/net/network_delegate_qt.cpp b/src/core/net/network_delegate_qt.cpp index 3641cb845..60478d3ef 100644 --- a/src/core/net/network_delegate_qt.cpp +++ b/src/core/net/network_delegate_qt.cpp @@ -68,6 +68,9 @@ WebContentsAdapterClient::NavigationType pageTransitionToNavigationType(ui::Page if (qualifier & ui::PAGE_TRANSITION_FORWARD_BACK) return WebContentsAdapterClient::BackForwardNavigation; + // FIXME: Make redirects a separate type: + if (qualifier & ui::PAGE_TRANSITION_CLIENT_REDIRECT) + return WebContentsAdapterClient::OtherNavigation; ui::PageTransition strippedTransition = ui::PageTransitionStripQualifier(transition); diff --git a/src/core/ozone/gl_surface_glx_qt.cpp b/src/core/ozone/gl_surface_glx_qt.cpp index 4faa08091..24772889f 100644 --- a/src/core/ozone/gl_surface_glx_qt.cpp +++ b/src/core/ozone/gl_surface_glx_qt.cpp @@ -173,7 +173,7 @@ bool GLSurfaceGLXQt::Initialize(GLSurfaceFormat format) GLX_PBUFFER_HEIGHT, m_size.height(), GLX_LARGEST_PBUFFER, x11::False, GLX_PRESERVED_CONTENTS, x11::False, - NULL + x11::None // MEMO doc: ...must be terminated with None or NULL }; m_surfaceBuffer = glXCreatePbuffer(display, static_cast<GLXFBConfig>(g_config), pbuffer_attributes); diff --git a/tests/auto/widgets/qwebenginepage/resources/reload.html b/tests/auto/widgets/qwebenginepage/resources/reload.html new file mode 100644 index 000000000..d9c33dfcd --- /dev/null +++ b/tests/auto/widgets/qwebenginepage/resources/reload.html @@ -0,0 +1,8 @@ +<html> +<head> +<meta http-equiv="refresh" content="2"> +</head> +<body> +This is test content +</body> +</html> diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp index 916db3d1e..3792b5522 100644 --- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp +++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp @@ -562,11 +562,17 @@ void tst_QWebEnginePage::acceptNavigationRequestNavigationType() QTRY_COMPARE(loadSpy.count(), 4); QTRY_COMPARE(page.navigations.count(), 4); + page.load(QUrl("qrc:///resources/reload.html")); + QTRY_COMPARE(loadSpy.count(), 6); + QTRY_COMPARE(page.navigations.count(), 6); + QList<QWebEnginePage::NavigationType> expectedList; expectedList << QWebEnginePage::NavigationTypeTyped << QWebEnginePage::NavigationTypeTyped << QWebEnginePage::NavigationTypeBackForward - << QWebEnginePage::NavigationTypeReload; + << QWebEnginePage::NavigationTypeReload + << QWebEnginePage::NavigationTypeTyped + << QWebEnginePage::NavigationTypeOther; QVERIFY(expectedList.count() == page.navigations.count()); for (int i = 0; i < expectedList.count(); ++i) { QCOMPARE(page.navigations[i].type, expectedList[i]); diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.qrc b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.qrc index 757e151c1..cf32486e7 100644 --- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.qrc +++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.qrc @@ -14,6 +14,7 @@ <file>resources/user.css</file> <file>resources/image.png</file> <file>resources/pasteimage.html</file> + <file>resources/reload.html</file> <file>resources/style.css</file> <file>resources/test1.html</file> <file>resources/test2.html</file> |