diff options
| author | Robert Griebl <robert.griebl@pelagicore.com> | 2018-07-04 13:06:16 +0200 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@pelagicore.com> | 2018-07-11 11:54:38 +0000 |
| commit | a401788fc80661f1801c1c27857e439af5199742 (patch) | |
| tree | 320ae13fc3356ff845ef1b229118454353a9dff8 | |
| parent | eddd13dda4969f01dd7545c126a550bd77ee944b (diff) | |
| download | qtapplicationmanager-a401788fc80661f1801c1c27857e439af5199742.tar.gz | |
Build fix: Wayland extensions have to be built differently nowadays
Change-Id: I446e138ece9647a5e4c021cc42569c1713889d9c
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
| -rw-r--r-- | src/launcher-lib/launcher-lib.pro | 3 | ||||
| -rw-r--r-- | src/window-lib/window-lib.pro | 3 | ||||
| -rw-r--r-- | sync.profile | 11 |
3 files changed, 15 insertions, 2 deletions
diff --git a/src/launcher-lib/launcher-lib.pro b/src/launcher-lib/launcher-lib.pro index 587725b1..15421752 100644 --- a/src/launcher-lib/launcher-lib.pro +++ b/src/launcher-lib/launcher-lib.pro @@ -27,7 +27,8 @@ SOURCES += \ !headless:qtHaveModule(waylandclient) { QT *= waylandclient waylandclient-private - CONFIG *= wayland-scanner + CONFIG *= wayland-scanner generated_privates + private_headers.CONFIG += no_check_exists WAYLANDCLIENTSOURCES += ../wayland-extensions/qtam-extension.xml HEADERS += waylandqtamclientextension_p.h SOURCES += waylandqtamclientextension.cpp diff --git a/src/window-lib/window-lib.pro b/src/window-lib/window-lib.pro index 60fc049e..51b5bfd3 100644 --- a/src/window-lib/window-lib.pro +++ b/src/window-lib/window-lib.pro @@ -31,7 +31,8 @@ multi-process:!headless { WAYLANDSERVERSOURCES += \ ../wayland-extensions/qtam-extension.xml - CONFIG *= wayland-scanner + CONFIG *= wayland-scanner generated_privates + private_headers.CONFIG += no_check_exists } !headless:HEADERS += \ diff --git a/sync.profile b/sync.profile index 17aeb6a8..16369812 100644 --- a/sync.profile +++ b/sync.profile @@ -33,3 +33,14 @@ "qtdeclarative" => "", "qtwayland" => "", ); +%inject_headers = ( + "$basedir/src/launcher-lib" => [ + "^qwayland-qtam-extension.h", + "^wayland-qtam-extension-client-protocol.h", + ], + "$basedir/src/window-lib" => [ + "^qwayland-server-qtam-extension.h", + "^wayland-qtam-extension-server-protocol.h" + ], +); +@private_headers = ( qr/^qwayland-.*\.h/, qr/^wayland-.*-protocol\.h/ ); |