diff options
| -rw-r--r-- | application-manager.pro | 2 | ||||
| -rw-r--r-- | qmake-features/am-config.prf | 2 | ||||
| -rw-r--r-- | src/window-lib/window-lib.pro | 6 |
3 files changed, 4 insertions, 6 deletions
diff --git a/application-manager.pro b/application-manager.pro index 1caac411..e5d612fc 100644 --- a/application-manager.pro +++ b/application-manager.pro @@ -17,7 +17,7 @@ qtCompileTest(libarchive) qtCompileTest(libyaml) !headless:qtCompileTest(touchemulation) -qtHaveModule(waylandcompositor):qtHaveModule(waylandcompositor-private):CONFIG += am_compatible_compositor +qtHaveModule(waylandcompositor):CONFIG += am_compatible_compositor force-single-process:force-multi-process:error("You cannot both specify force-single-process and force-multi-process") force-multi-process:!headless:!am_compatible_compositor:error("You forced multi-process mode, but the QtCompositor module is not available") diff --git a/qmake-features/am-config.prf b/qmake-features/am-config.prf index c3ce1311..165b4334 100644 --- a/qmake-features/am-config.prf +++ b/qmake-features/am-config.prf @@ -21,7 +21,7 @@ linux:!android:!disable-libbacktrace:if(enable-libbacktrace|CONFIG(debug, debug| !force-single-process { linux|osx { - headless|if(qtHaveModule(waylandcompositor):qtHaveModule(waylandcompositor-private)) { + headless|if(qtHaveModule(waylandcompositor)) { CONFIG *= auto-multi-process } } diff --git a/src/window-lib/window-lib.pro b/src/window-lib/window-lib.pro index f11f1aa8..60fc049e 100644 --- a/src/window-lib/window-lib.pro +++ b/src/window-lib/window-lib.pro @@ -24,10 +24,8 @@ multi-process:!headless { waylandwindow.cpp \ waylandqtamserverextension.cpp - qtHaveModule(waylandcompositor):qtHaveModule(waylandcompositor-private) { - QT *= waylandcompositor waylandcompositor-private - !osx:PKGCONFIG += wayland-server - + qtHaveModule(waylandcompositor) { + QT *= waylandcompositor HEADERS += waylandcompositor_p.h } WAYLANDSERVERSOURCES += \ |