diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-14 11:33:02 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-14 11:33:02 +0100 |
| commit | 27432d40f2500b11780398f6c7d67719050dae6c (patch) | |
| tree | 97f9a60af2d520d66fa7ff802ccddad56e0cadaf /src/gui/configure.json | |
| parent | 071a120400b17eaa0b414a0ed262b0a090908679 (diff) | |
| parent | 10ecbc4041cb7db004f4ed4d40ce082553d75844 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I2bd2e61bae1eab4fc74fa6accd741ed9ae1f0669
Diffstat (limited to 'src/gui/configure.json')
| -rw-r--r-- | src/gui/configure.json | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index 6d0848c9f0..08e50db906 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -520,7 +520,7 @@ }, "libinput-axis-api": { "label": "axis API in libinput", - "condition": "tests.libinput_axis_api", + "condition": "features.libinput && tests.libinput_axis_api", "output": [ "privateFeature" ] }, "lgmon": { @@ -614,8 +614,7 @@ "eglfs": { "label": "EGLFS", "section": "Platform plugins", - "autoDetect": "!config.android && !config.win32", - "condition": "features.egl", + "condition": "!config.android && !config.darwin && !config.win32 && features.egl", "output": [ "privateFeature" ] }, "eglfs_brcm": { |