diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 01:00:54 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 01:00:54 +0100 |
| commit | 92e888f27e72f464ff2e366be307c1f1abce33e0 (patch) | |
| tree | cdbffd0ebdc17b728a71330faffa42ff2df25044 /src/gui | |
| parent | c31cdb1b3fb21985cfe8bba820086acc3349eed0 (diff) | |
| parent | 77455a9a8c678daf4a3035ce0c835f7bfeb617ee (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Icd98de8592828c60cfea3d69f9c7ae2711b9f059
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/configure.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index 39b8d0c2b8..134a2e0a15 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -1376,7 +1376,7 @@ }, "egl": { "label": "EGL", - "condition": "(features.opengl || features.openvg) && (features.angle || libs.egl) && (features.dlopen || !config.unix)", + "condition": "(features.opengl || features.openvg) && (features.angle || libs.egl) && (features.dlopen || !config.unix || config.integrity)", "output": [ "privateFeature", "feature" ] }, "egl_x11": { |