diff options
| author | Robert Griebl <robert.griebl@pelagicore.com> | 2018-04-16 18:38:41 +0200 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@pelagicore.com> | 2018-04-17 07:26:43 +0000 |
| commit | 6432c86c7dc38f1c1fa040ca813d608c6291a382 (patch) | |
| tree | 9554c9bcddc1e00f6da03683fa7042789ca6bf19 | |
| parent | 2437c9cb79edd3f4a904548d03d307f89356e9e9 (diff) | |
| download | qtapplicationmanager-6432c86c7dc38f1c1fa040ca813d608c6291a382.tar.gz | |
Remove the last traces of pre-5.7 QtWayland
Change-Id: Iac1f6e80cd4dce60401b92b6ba78293c6655331c
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
| -rw-r--r-- | application-manager.pro | 4 | ||||
| -rw-r--r-- | qmake-features/am-config.prf | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/application-manager.pro b/application-manager.pro index 15cbf405..41c8ce9a 100644 --- a/application-manager.pro +++ b/application-manager.pro @@ -15,9 +15,7 @@ qtCompileTest(libarchive) qtCompileTest(libyaml) !headless:qtCompileTest(touchemulation) -qtHaveModule(compositor)|if(qtHaveModule(waylandcompositor):qtHaveModule(waylandcompositor-private)) { - CONFIG += am_compatible_compositor -} +qtHaveModule(waylandcompositor):qtHaveModule(waylandcompositor-private):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 d136f91f..c3ce1311 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|qtHaveModule(compositor)|if(qtHaveModule(waylandcompositor):qtHaveModule(waylandcompositor-private)) { + headless|if(qtHaveModule(waylandcompositor):qtHaveModule(waylandcompositor-private)) { CONFIG *= auto-multi-process } } |