summaryrefslogtreecommitdiffstats
path: root/src/core/ozone
Commit message (Collapse)AuthorAgeFilesLines
* Use new x11 native interface to query xdisplayMichal Klocek2021-11-171-3/+5
| | | | | | | | | | | | | | | | | | | | | The call to nativeResourceForScreen can return egl native display handle if called with "display", since it gets mapped to XLibDisplay but egl device intergration can return EGLDisplay. This is not the case for nativeResourceForIntegration. Use new native QX11Application interface to query for display, note there is not need to use nativeResourceForScreen for "display" anyway since qt does not support multiple x connections to different displays. This fixes places where code queries "display" and bails out if it is null. Fixes: QTBUG-97472 Pick-to: 6.2 6.2.2 Change-Id: Ibc5f8f96e612389bfa24a81268202c9e47a7580b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Check if xkb extension is presentMichal Klocek2021-11-101-0/+6
| | | | | | | | | | | | | According to docs: "You must call XkbQueryExtension or XkbOpenDisplay before using any other Xkb library interfaces" Task-number: QTBUG-97472 Pick-to: 6.2 Change-Id: I84c1bc49b077224a93d9f8d7a9ac29fe089de13e Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Fix leak of properties after XkbRF_GetNamesPropKirill Burtsev2021-10-051-1/+11
| | | | | | | | | | | | Struct _XkbRF_VarDefs for XkbRF_GetNamesProp needs special cleanup logic, but it's currently missing from API: https://gitlab.freedesktop.org/xorg/lib/libxkbfile/-/issues/6 Workaround it with manual deinitialization. Pick-to: 6.2 Change-Id: I3ebe20f58199277521b31b2cd8034c92fd1f2b7f Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Fix no webrtc buildsMichal Klocek2021-09-261-2/+6
| | | | | | | | | | | In case of ozone x11 backend we need x11, which is pulled by use_webrtc_x11, however in case of no webrtc build we lack x11 dependency. Add missing dependency. Change-Id: I19eada846115073251cdf85ce1fabd4d1d2baf2e Reviewed-by: Michael Brüning <michael.bruning@qt.io> (cherry picked from commit 630062f1189b95689e28e40c5c76d95d3214d123)
* Fix build when xcb only over egl/es2Michal Klocek2021-09-181-2/+3
| | | | | | | | | | | Qt's xcb can be compiled without the glx support, do not use Chromium flag to check that. Fixes: QTBUG-96398 Change-Id: Ie7f1fe74699cd83aee1f9e5aff59760d4d7a70bf Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 0fba07e0238a9ff0a1b496eae60ad92257ea76af) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix missing xkbcommon include on openSUSEMichal Klocek2021-08-061-0/+8
| | | | | | | | | | | We include xkb_key_code_converter.h when compiling ozone_platform_qt.cpp Fixes: QTBUG-95473 Pick-to: 6.2 Change-Id: I45f8dbdd3bcd7934d376256ec08560a8327a8e70 Reviewed-by: Christophe Giboudeaux <christophe@krop.fr> Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Fix assertion in getCurrentKeyboardLayout()Szabolcs David2021-07-201-0/+3
| | | | | | | | | | | | | FATAL:xkb_keyboard_layout_engine.cc(640)] Keymap file failed to load: hu-us If there are multiple layouts provided (eg. "hu,us") and there is no layout variant, we appended the second layout as a variant (eg. "hu-us"). This happens because strtok() caches the pointer of the next token from its previous call and uses that when processing a null string. Pick-to: 6.2 Change-Id: Ic1d8bd14f95bda65a9fba82c1df45af306c4445b Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Fix Keyboard.getLayoutMap() with cmake buildPeter Varga2021-07-122-8/+8
| | | | | | | | USE_X11 is disabled but we don't need it due to the USE_XKBCOMMON check. Pick-to: 6.2 Change-Id: Ief5ed178152da10ceef3d2c3a415647ce6d3aee6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Adaptations for 90-basedAllan Sandfeld Jensen2021-07-084-7/+31
| | | | | | Pick-to: 6.2 Change-Id: I8402b044d8e12d75e144a00984b856f3de10bffd Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Fix QWebEngineQuick namespace for webenginequick moduleMichal Klocek2021-06-152-2/+2
| | | | | | | | | | | This is followup change for QtWebEngineQuick rename. [ChangeLog][QtWebEngineQuick] Use namespace QtWebEngineQuick QtWebEngine::initialize() is now QtWebEnigneQuick::initialize() Pick-to: 6.2 Change-Id: I90acab04ff0240b399a863c88eff915efa360f6f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix compliation without xcb-glxMichal Klocek2021-05-281-13/+13
| | | | | Change-Id: Ibfc51d1937f42264de0eeb1abacb8999d21fe3dc Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2021-05-192-0/+76
|\ | | | | | | | | | | | | Conflicts: src/core/render_widget_host_view_qt.cpp Change-Id: I86113b13bb2d8419e9e9a485197f02b2c7399cd4
| * Add support for Keyboard.getLayoutMap()Peter Varga2021-05-122-0/+76
| | | | | | | | | | | | | | | | | | | | | | Pulls in the following changes: Submodule src/3rdparty 6c7b4ffb..1d3b13e9 > 1d3b13e9634 Make clang to inline load/store atomic calls for YieldSortKey struct > f6730fe81a0 Enable XkbKeyboardLayoutEngine::SetCurrentLayoutByName for Qt Fixes: QTBUG-92971 Change-Id: I0c0cddfe4d3e25fd6d3f7e0764b302c300303172 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Clean up gl_surface_qt.cppPeter Varga2021-04-201-28/+7
| | | | | | | | | | Change-Id: I0621c2c5cca8fd1d028a25f6f43faeb8ce23b8fd Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Fix the build after 88 adaptationsAllan Sandfeld Jensen2021-04-161-14/+14
| | | | | | | | | | | | | | And clean up where -Qt and non Qt declarations are in the file. Change-Id: I152b548ee0fd81f3388fb20e86349e05ef401bfb Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | Adaptations for Chromium 88Allan Sandfeld Jensen2021-04-155-10/+6
| | | | | | | | | | Change-Id: Ie66e95dbb9fbcafe961bb98d5c277f8c32d66b96 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2021-01-257-20/+41
|\| | | | | | | | | | | Including update to 87-based Change-Id: I36b6054e00de97ab055d0bc800cff08d0408fac6
| * Adaptations for Chromium 87Allan Sandfeld Jensen2021-01-134-12/+23
| | | | | | | | | | Change-Id: Ic4ffd98e02f986dbaf986405360e727c813e696e Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| * Adaptations for Chromium 86Allan Sandfeld Jensen2021-01-131-0/+5
| | | | | | | | | | Change-Id: I7e0ebecdbb68cfff0b574c966f3fa80d28680e1c Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| * Adaptations for Chromium 85Allan Sandfeld Jensen2021-01-131-5/+5
| | | | | | | | | | Change-Id: I33c1af7c431055d95e0fb540246765cce684de15 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| * Adaptations for Chromium 84Allan Sandfeld Jensen2021-01-131-0/+5
| | | | | | | | | | Change-Id: I359805d0bea84147fca6de2e2c7b17b4dcb17bc7 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2020-12-111-2/+2
|\| | | | | | | Change-Id: Id1a1f4ca84697ba18e2604090e3154295fe1858b
| * Fix opengl headers inclusion issuesv5.15.2Michal Klocek2020-11-091-12/+2
| | | | | | | | | | | | | | | | | | | | | | Chromium gl bindings headers get mixed with qt opengl headers. This results in GLDEBUGPROC missing definition errors. Fixes compilation for apalis-imx6 on zeus. Task-number: QTBUG-88219 Change-Id: I0a18ceff3336ab457c2d9f35ef17c28c01bbe035 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Update dependencies on 'dev' in qt/qtwebengineAllan Sandfeld Jensen2020-11-022-6/+6
| | | | | | | | | | Change-Id: I74c7293ebf5ace5bd07e3bf5455dd90bf4ed6380 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2020-09-1411-67/+59
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/core/certificate_error_controller.cpp src/core/certificate_error_controller.h src/core/compositor/compositor.cpp src/core/compositor/compositor.h src/core/compositor/display_gl_output_surface.cpp src/core/content_browser_client_qt.cpp src/core/core_chromium.pri src/core/delegated_frame_host_client_qt.cpp src/core/ozone/gl_share_context_qt.h src/core/ozone/surface_factory_qt.cpp src/core/permission_manager_qt.cpp src/core/render_widget_host_view_qt.cpp src/core/render_widget_host_view_qt.h src/core/web_engine_context.cpp src/core/web_engine_settings.cpp src/core/web_event_factory.cpp tests/auto/widgets/qwebenginedownloadrequest/tst_qwebenginedownloadrequest.cpp Change-Id: Ice14c3c350b139e800c7c7011b7cef1fc7010669
| * Remove duplicate includesAllan Sandfeld Jensen2020-09-121-10/+5
| | | | | | | | | | | | | | Most of the includes were included twice Change-Id: Ie2967e9d8ef4799c28a856ade7318d24bac391c6 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * Adaptations for Chromium 83Allan Sandfeld Jensen2020-09-096-25/+30
| | | | | | | | | | Change-Id: I63ed851426b18623d549ceaf87f1b6eeec527966 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
| * Chromium 81-based adaptationsAllan Sandfeld Jensen2020-09-095-13/+7
| | | | | | | | | | Change-Id: Ie422b327025da084bc8038c7a0aadee2db801f29 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | Unify ozone platform selection in surfacefactoryqtMichal Klocek2020-08-051-7/+15
| | | | | | | | | | | | | | Use shared context to select between glx and egl. Change-Id: I6504400b9a2e2d23952c6da22fd42cf547596146 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Fix not working acceleration on MacMichal Klocek2020-08-051-1/+6
| | | | | | | | | | | | | | | | | | Since 6ff79478a in base we no longer are able to query for 'cqlcontextobj' add helper call for CGLContextObj. Change-Id: Ie1992ab7a0e525c2c6b5f9a67ce354a493e993e8 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Rewrite native context handling for QtShareGLContextMichal Klocek2020-08-052-0/+204
| | | | | | | | | | Change-Id: Ie880978f2122528789d7ec23b24bb8259eee0fb8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Support OpenGL over EGLMichal Klocek2020-07-302-4/+4
|/ | | | | | | This enables wayland with opengl contex. Change-Id: I4214cfaebb205c54394ef382cd58fbbcfdc5f1db Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Initialize the extension bindings in g_driver_eglRomain Pokrzywka2020-06-251-0/+7
| | | | | | | | | | | This step is done in GLSurfaceEGL but missing in GLSurfaceEGLQt. The extension bindings in g_driver_egl are checked, among other things, when initializing DXVAVideoDecodeAccelerator, so we need them to enable hardware-accelerated video decoding on Windows with ANGLE. Change-Id: I6a650a0aafe3d4f870101d33d2117427c22304e7 Reviewed-by: Romain Pokrzywka <romain.pokrzywka@gmail.com> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Switch away from QT_NO_OPENGLAllan Sandfeld Jensen2020-05-112-6/+6
| | | | | Change-Id: I310265dacc9b1c8d391e82b6adf52b70c037d9b9 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Adaptations for Chromium 80Allan Sandfeld Jensen2020-04-075-13/+11
| | | | | Change-Id: Icaf68648cbc2c13a61fc3b208ff1e64ca36c90b6 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* Fix rare crash on exit in isCreateContextRobustnessSupportedMichal Klocek2020-03-272-8/+12
| | | | | | | | | | | | | During shutdown we might need to flush the gpu buffer if root frame sink is being deleted, which needs current context, which calls isCreateContextRobustnessSupported and ends up in calling platformName() from gpu thread, which might be already destructed on ui thread. Keep context helper till gpu thread is gone. Task-number: QTBUG-79864 Change-Id: Idadc064694fe0584fb894a9405a0af80d9848626 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Replace NULL in gl_surface_qt.cppPeter Varga2020-03-261-5/+5
| | | | | | | | Fixes build error with MSVC: error C2440: 'return': cannot convert from 'int' to 'scoped_refptr<gl::GLSurface>' Change-Id: Ie24528cc98951de6863c12e1d25e3722bd20b046 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Adaptations for Chromium 79Allan Sandfeld Jensen2020-02-283-6/+15
| | | | | | | | Fixes: QTBUG-80737 Fixes: QTBUG-81556 Fixes: QTBUG-81614 Change-Id: Ie6a69cdbf46d0508bff226f1b8fed28a618e1949 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Adaptations for Chromium 78Allan Sandfeld Jensen2020-02-281-2/+2
| | | | | | | | | | Including removal of renderer service. [ChangeLog][QWebEngineSetting] XSS Auditing has been removed, and XSSAuditingEnabled no longer has any effect. Change-Id: I0835e2a76551057f3eea30a343e0373b642192f0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Request Chromium ANGLE implementation on WindowsAllan Sandfeld Jensen2019-10-251-1/+2
| | | | | | | Chromium now separates normal EGL and ANGLE OpenGL targets. Change-Id: I59555c856a6d9862dabe531dcdb53f50311b37c2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Adaptations for Chromium 77Allan Sandfeld Jensen2019-10-114-5/+32
| | | | | | Fixes: QTBUG-77267 Change-Id: I181e24cf80ebee6991b95dde6c636f0d169b40a4 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Adaptations for Chromium 75Allan Sandfeld Jensen2019-07-103-3/+11
| | | | | Change-Id: Idad08244e0c749a9f70f5eb9f8cd236039b941b3 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Adaptations for Chromium 74Allan Sandfeld Jensen2019-07-102-2/+2
| | | | | Change-Id: Icdefa05eec39c632328dfc40862e5b734170bf3f Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Remove usages of deprecated QLatin1LiteralSona Kurazyan2019-06-251-1/+1
| | | | | | Task-number: QTBUG-76491 Change-Id: I19762b1d04fd7225963ac4e0e90cac6ca01256f7 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Fix offscreen with glx backendPeter Varga2019-06-201-0/+3
| | | | | | | The offscreen qpa plugin doesn't set robustness for the shared context. Change-Id: I43715a2ae1b6b25876473dea4139ab76273329e7 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Pass robustness support on to Chromium when supportedAllan Sandfeld Jensen2019-04-164-2/+12
| | | | | Change-Id: Ie34d36601efc743432202c2ad1f40e9837530b5e Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Adaptations for Chromium 73Allan Sandfeld Jensen2019-03-234-6/+50
| | | | | Change-Id: I565d1e327852110a5abebed3388d7cd6986bef06 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Merge remote-tracking branch 'origin/5.12' into 5.13Allan Sandfeld Jensen2019-03-201-1/+1
|\ | | | | | | Change-Id: If0a4c869d801fe94df23201391c30c1efc5000e0
| * Fix warning: implicit conversion of NULL constant to 'const int'Kirill Burtsev2019-03-151-1/+1
| | | | | | | | | | | | Task-number: QTBUG-74311 Change-Id: If912564ecd29e4f11a613905f2b9169326207ec2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Allan Sandfeld Jensen2019-02-151-1/+1
|\| | | | | | | Change-Id: I0822fb8a10945a252cfd1aacaf0b6d9902cc8831
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 21:22:12 +0000