diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2017-09-21 11:39:17 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-02 20:52:21 +0000 |
| commit | 3ee51f8f085da394851857b0d6a42df537ca99da (patch) | |
| tree | 9c4e81cd778caeedbb45c075301cb8dc0506b948 /mkspecs | |
| parent | 20abae270a20d312d45fc7f850af44603f5f38de (diff) | |
Use ozone for x11
Switch to use ozone also for x11/glx. This way we have a
more elegant approach to hook in our gl surface classes
and we use ozone for all linux qpa backends. Moreover,
we have now also more fine grain control to reimplement
gl surface handling logic.
This also aims to fix currently broken wayland backend,
but instead of patching the broken x11 calls, we simply reuse
ozone which does not use x11 for ozone egl.
Add webengine-x11 check to handle ozone glx plugin compilation.
For ozone egl backend reimplement missing functions.
Task-number: QTBUG-65682
Task-number: QTBUG-51631
Change-Id: I8b45c6f4d09a1c703efb12b6452d78ab385371ab
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/functions.prf | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf index 8564bad8a..ac84ad321 100644 --- a/mkspecs/features/functions.prf +++ b/mkspecs/features/functions.prf @@ -77,10 +77,7 @@ defineReplace(gnPath) { } defineReplace(gnArgs) { - linux { - qtConfig(webengine-embedded-build): include($$QTWEBENGINE_ROOT/src/core/config/embedded_linux.pri) - else: include($$QTWEBENGINE_ROOT/src/core/config/desktop_linux.pri) - } + linux: include($$QTWEBENGINE_ROOT/src/core/config/linux.pri) macos: include($$QTWEBENGINE_ROOT/src/core/config/mac_osx.pri) win32: include($$QTWEBENGINE_ROOT/src/core/config/windows.pri) isEmpty(gn_args): error(No gn_args found please make sure you have valid configuration.) |