diff options
author | Eike Ziller <eike.ziller@qt.io> | 2022-01-06 10:46:57 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2022-01-06 11:55:39 +0100 |
commit | 65e8c864af2b7c0966c3797f296b62312d21a4c2 (patch) | |
tree | 56952514173a1bbd5921f438b62ae5c82b8d1c31 /scripts | |
parent | 2f71b49399f44f7f3bf57179f40cdbf17f043d9b (diff) | |
parent | 243521380b3358d2e7c79cd49db7fb1e7e8db1ba (diff) | |
download | qt-creator-65e8c864af2b7c0966c3797f296b62312d21a4c2.tar.gz |
Merge remote-tracking branch 'origin/6.0'
Change-Id: I405e3f95b0cdcd7b2686f31baae16c03c787f007
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/build_plugin.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/build_plugin.py b/scripts/build_plugin.py index d3e9c7bb9e..cddb9f126a 100755 --- 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'] |