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 /src/core | |
| parent | 30799e154333c291899cec8d9ff167755ff592c0 (diff) | |
| parent | 0f93f145008b84b5f6e266380cab1dbb2f7ab9cd (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" into refs/staging/5.13
Diffstat (limited to 'src/core')
| -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 |
3 files changed, 12 insertions, 1 deletions
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); |