diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-21 12:36:46 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-12-03 09:34:52 +0000 |
| commit | 4c4bb71581ef385646cd8cef04274d63ef2c6fba (patch) | |
| tree | 1854e5739ea584d8323ece538e0d7986dbbb0c2e | |
| parent | e76f9a9106e28a8d2328e00c66071cee3b87d504 (diff) | |
Fix xscrnsaver detection
With Ozone use_xscrnsaver defaults to false, so reverse when we set it.
Change-Id: I6950f68a693092bf9315e3d8202347adac3c4742
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| -rw-r--r-- | src/core/config/linux.pri | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index 752d2281f..85b948db2 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -24,10 +24,6 @@ qtConfig(webengine-embedded-build) { !use_gold_linker: gn_args += use_gold=false } -qtConfig(webengine-system-x11): hasX11Dependencies() { - gn_args += ozone_platform_x11=true -} - clang { clang_full_path = $$which($${QMAKE_CXX}) # Remove the "/bin/clang++" part. @@ -171,7 +167,11 @@ host_build { gn_args += use_alsa=false } !packagesExist(libpci): gn_args += use_libpci=false - !packagesExist(xscrnsaver): gn_args += use_xscrnsaver=false + + qtConfig(webengine-system-x11): hasX11Dependencies() { + gn_args += ozone_platform_x11=true + packagesExist(xscrnsaver): gn_args += use_xscrnsaver=true + } qtConfig(webengine-system-libevent): gn_args += use_system_libevent=true qtConfig(webengine-system-libwebp): gn_args += use_system_libwebp=true |