diff options
| author | Cristián Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2021-11-18 13:45:31 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-11-19 08:12:33 +0000 |
| commit | d3b264e14933c4b35a070c76b51adc00426a4bce (patch) | |
| tree | 290564cc0250a550ef3db56d86d379b765055e50 | |
| parent | d75f7be6437c19328f224ed8fef4eb35eb5129b8 (diff) | |
Use legacy OpenGL option to build on linux
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>
(cherry picked from commit 35deefbc82892b7002913dc527e3403ae00f573c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | build_scripts/main.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/build_scripts/main.py b/build_scripts/main.py index bb5429a48..160eb12a8 100644 --- a/build_scripts/main.py +++ b/build_scripts/main.py @@ -770,6 +770,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") |