diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-07-19 12:08:56 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-07-23 13:52:46 +0200 |
| commit | c18c51acf8d0eb9426ce998d6e09f20a4a481c40 (patch) | |
| tree | 3f314634c361f6ccb4e43d596370167003ec210a /src/core/core_chromium.pri | |
| parent | f43d9dc448f0fd2073f44ea696205969ffd0d9c8 (diff) | |
| parent | 662de14ceecee701b31478849ae147c70f3fe00f (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/core/config/common.pri
src/core/configure.json
src/core/net/url_request_qrc_job_qt.cpp
src/core/ozone/surface_factory_qt.cpp
src/core/web_contents_adapter.cpp
Change-Id: If679aa179123f793639da3d8ee4ab5d116707754
Diffstat (limited to 'src/core/core_chromium.pri')
| -rw-r--r-- | src/core/core_chromium.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/core_chromium.pri b/src/core/core_chromium.pri index 5d55f35a2..8ff79c782 100644 --- a/src/core/core_chromium.pri +++ b/src/core/core_chromium.pri @@ -245,7 +245,7 @@ HEADERS = \ web_event_factory.h -qtConfig(webengine-system-x11): hasX11Dependencies() { +qtConfig(webengine-ozone-x11) { HEADERS += ozone/gl_ozone_glx_qt.h \ ozone/gl_surface_glx_qt.h SOURCES += ozone/gl_surface_glx_qt.cpp \ |