diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-02-24 14:54:51 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-02 09:39:17 +0000 |
| commit | 9e65be433c1278382e1b052db0548f088e905002 (patch) | |
| tree | 92aa443e0af7a2587e3ee267ff76ffa5b8bbbfc4 | |
| parent | 0c6312dfba960365771c64b937579a40e02ea5f7 (diff) | |
Make xscrnsaver optional
Allow building on machines where xscrnsaver is not present, but turning
of the corresponding features.
Change-Id: Iabf7063fcc25f68f5a9fefc95a1caf164da49fed
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| -rw-r--r-- | src/core/config/linux.pri | 1 | ||||
| -rw-r--r-- | tools/qmake/mkspecs/features/configure.prf | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index 7b8af34b0..876ac19b9 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -62,6 +62,7 @@ use?(gn) { packagesExist(libffi): gn_args += use_system_libffi=true else: gn_args += use_system_libffi=false !packagesExist(libpci): gn_args += use_libpci=false + !packagesExist(xscrnsaver): gn_args += use_xscrnsaver=false use?(system_libevent): gn_args += use_system_libevent=true use?(system_libwebp): gn_args += use_system_libwebp=true diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index f12bf5ae9..33d32b844 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -46,7 +46,7 @@ defineTest(runConfigure) { !config_khr:skipBuild("khronos development headers appear to be missing (mesa/libegl1-mesa-dev)") REQUIRED_PACKAGES = dbus-1 fontconfig - !contains(WEBENGINE_CONFIG, embedded_build): qtConfig(xcb): REQUIRED_PACKAGES += libdrm xcomposite xcursor xi xrandr xscrnsaver xtst + !contains(WEBENGINE_CONFIG, embedded_build): qtConfig(xcb): REQUIRED_PACKAGES += libdrm xcomposite xcursor xi xrandr xtst qtConfig(pulseaudio): REQUIRED_PACKAGES += libpulse qtConfig(system-png): REQUIRED_PACKAGES += libpng qtConfig(system-harfbuzz) { |