diff options
author | Michael BrĂ¼ning <michael.bruning@qt.io> | 2020-07-24 10:30:54 +0200 |
---|---|---|
committer | Michael BrĂ¼ning <michael.bruning@qt.io> | 2020-07-24 15:23:10 +0200 |
commit | 54b84e14589b3e51f2f2e7980e2af2559601efe2 (patch) | |
tree | eafef9f5b854cd90f6fa8e1ae5ab9e161a424aa3 /src/core/core_chromium.pri | |
parent | 27332664b2745d7d322b8afbc1a41dc0fbfc763a (diff) | |
parent | a2a19a6965601ced75e3e48b2bf618ba2bdbd29e (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/core/compositor/delegated_frame_node.cpp
src/core/core_chromium.pri
src/core/render_widget_host_view_qt.cpp
Change-Id: I9387151e9647c87fc387095e7b6d8d66560cdf71
Diffstat (limited to 'src/core/core_chromium.pri')
-rw-r--r-- | src/core/core_chromium.pri | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/core_chromium.pri b/src/core/core_chromium.pri index 14a65a39c..60cc104cf 100644 --- a/src/core/core_chromium.pri +++ b/src/core/core_chromium.pri @@ -297,6 +297,11 @@ contains(QT_CONFIG, opengl) { HEADERS += \ compositor/compositor_resource_fence.h \ compositor/display_gl_output_surface.h + + macos { + HEADERS+=macos_context_type_helper.h + SOURCES+=macos_context_type_helper.mm + } } qtConfig(webengine-geolocation) { |