Merge remote-tracking branch 'origin/6.0'

Change-Id: I405e3f95b0cdcd7b2686f31baae16c03c787f007
2022-01-06 10:46:57 +01:00
parent 2f71b49399 243521380b
commit 65e8c864af
145 changed files with 2686 additions and 472 deletions
--- a/scripts/build_plugin.py
+++ b/scripts/build_plugin.py
@@ -109,6 +109,10 @@ def build(args, paths):
    # TODO this works around a CMake bug https://gitlab.kitware.com/cmake/cmake/issues/20119
    cmake_args += ['-DBUILD_WITH_PCH=OFF']

+    # work around QTBUG-89754
+    # Qt otherwise adds dependencies on libGLX and libOpenGL
+    cmake_args += ['-DOpenGL_GL_PREFERENCE=LEGACY']
+
    if args.with_docs:
        cmake_args += ['-DWITH_DOCS=ON']