diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-12-09 12:02:47 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-12-09 12:04:32 +0100 |
| commit | d422b408e037b5943a9a192e1bd35d2ec6984afc (patch) | |
| tree | 3f259da342d28c48a90fb5a0b2db69bfc8af2dd0 /scripts/build.py | |
| parent | 420b5bf541bdeb0169c680f0b8008bf45dc54c16 (diff) | |
| parent | f349de45f4ec1920bd4a4efc34f693561b270d8a (diff) | |
| download | qt-creator-d422b408e037b5943a9a192e1bd35d2ec6984afc.tar.gz | |
Merge remote-tracking branch 'origin/6.0'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
Change-Id: I32991a77e52831dd2e24cf4a51ec252998c2d743
Diffstat (limited to 'scripts/build.py')
| -rwxr-xr-x | scripts/build.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/build.py b/scripts/build.py index 91ccd5bae1..84ea1c3232 100755 --- a/scripts/build.py +++ b/scripts/build.py @@ -149,6 +149,10 @@ def common_cmake_arguments(args): pch_option = 'ON' if args.with_pch else 'OFF' cmake_args += ['-DBUILD_WITH_PCH=' + pch_option] + # work around QTBUG-89754 + # Qt otherwise adds dependencies on libGLX and libOpenGL + cmake_args += ['-DOpenGL_GL_PREFERENCE=LEGACY'] + return cmake_args def build_qtcreator(args, paths): |