aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristián Maureira-Fredes <Cristian.Maureira-Fredes@qt.io>2021-11-18 13:45:31 +0100
committerCristian Maureira-Fredes <cristian.maureira-fredes@qt.io>2021-11-18 18:15:25 +0000
commit35deefbc82892b7002913dc527e3403ae00f573c (patch)
treecfba5b1664907786af7a7e96dec242a2a9025be5
parent1986d8179d2edd4171bb1460e2a0ee97d6ee3e18 (diff)
Use legacy OpenGL option to build on linux
Pick-to: 6.2 Fixes: PYSIDE-1547 Change-Id: I7ff4fe084c4121d5635479d5fd2ed9b6a9fa0df7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com>
-rw-r--r--build_scripts/main.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/build_scripts/main.py b/build_scripts/main.py
index a53ff0328..04a629008 100644
--- a/build_scripts/main.py
+++ b/build_scripts/main.py
@@ -782,6 +782,12 @@ class PysideBuild(_build, DistUtilsCommandMixin):
cmake_cmd.append("-DSKIP_DOCS=yes")
log.info(f"Qt Source dir: {cmake_src_dir}")
+ # Use Legacy OpenGL to avoid issues on systems like Ubuntu 20.04
+ # which require to manually install the libraries which
+ # were previously linked to the QtGui module in 6.1
+ # https://bugreports.qt.io/browse/QTBUG-89754
+ cmake_cmd.append("-DOpenGL_GL_PREFERENCE=LEGACY")
+
if OPTION['AVOID_PROTECTED_HACK']:
cmake_cmd.append("-DAVOID_PROTECTED_HACK=1")