summaryrefslogtreecommitdiff
path: root/qmake-features
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@pelagicore.com>2017-02-27 12:03:50 +0100
committerRobert Griebl <robert.griebl@pelagicore.com>2017-02-27 14:13:27 +0000
commitb2cabefa6ea64844bb39af2bc55786cb92889836 (patch)
tree2fa037b7cfe91f5b446a63e0db6f2ae5a7d628b9 /qmake-features
parentae5ea61408819e5a3b01b6b99703f6e9ee7ea3da (diff)
downloadqtapplicationmanager-b2cabefa6ea64844bb39af2bc55786cb92889836.tar.gz
Build fix: make sure to also depend on waylandcompositor-private
Without this, the build may break on Debian when building against the system's Qt, because Debian does not ship the QtWayland private headers. Change-Id: I02fa7babc1e5dd8300e9db6814e94b2766b83875 Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Diffstat (limited to 'qmake-features')
-rw-r--r--qmake-features/am-config.prf6
1 files changed, 5 insertions, 1 deletions
diff --git a/qmake-features/am-config.prf b/qmake-features/am-config.prf
index 8504bc02..5b475d32 100644
--- a/qmake-features/am-config.prf
+++ b/qmake-features/am-config.prf
@@ -17,7 +17,11 @@ headless:DEFINES *= AM_HEADLESS
linux:!disable-libbacktrace:if(enable-libbacktrace|CONFIG(debug, debug|release)):DEFINES *= AM_USE_LIBBACKTRACE
!force-single-process {
- linux:if(qtHaveModule(compositor)|qtHaveModule(waylandcompositor)|headless):config_libdbus:CONFIG *= auto-multi-process
+ linux:config_libdbus {
+ headless|qtHaveModule(compositor)|if(qtHaveModule(waylandcompositor):qtHaveModule(waylandcompositor-private)) {
+ CONFIG *= auto-multi-process
+ }
+ }
if(force-multi-process|auto-multi-process) {
CONFIG *= multi-process
DEFINES *= AM_MULTI_PROCESS