diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-06-28 18:24:20 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-06-28 20:56:59 +0200 |
| commit | efbeace6ffa14de0f7a1ec8b8b9653056612d5f8 (patch) | |
| tree | eb2b2fccc7aa1422ed7be48e97c6fa90b057680a /sync.profile | |
| parent | 4d9e127d3c3171bd796c5d6fc7c1c2f70101ad34 (diff) | |
| parent | 56e01f9e3372446d20f0bb70bed0b88348f2a74b (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/client/qwaylandxdgsurface.cpp
src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgsurfacev5.cpp
src/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6.cpp
src/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6_p.h
Done-with: Johan Klokkhammer Helsing <johan.helsing@qt.io>
Change-Id: Ia39be6254a95af1c4efa831358cc06a697da3423
Diffstat (limited to 'sync.profile')
| -rw-r--r-- | sync.profile | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/sync.profile b/sync.profile index 458ee9f23..a2da7dbc4 100644 --- a/sync.profile +++ b/sync.profile @@ -17,3 +17,50 @@ %classnames = ( "qwaylandquickextension.h" => "QWaylandQuickExtension", ); +%inject_headers = ( + "$basedir/src/client" => [ + "^qwayland-hardware-integration.h", + "^qwayland-qt-windowmanager.h", + "^qwayland-qtkey-extension.h" , + "^qwayland-server-buffer-extension.h", + "^qwayland-surface-extension.h", + "^qwayland-text-input-unstable-v2.h", + "^qwayland-touch-extension.h", + "^qwayland-wayland.h", + "^qwayland-xdg-shell-unstable-v6.h", + "^qwayland-xdg-shell.h", + "^wayland-hardware-integration-client-protocol.h", + "^wayland-qt-windowmanager-client-protocol.h", + "^wayland-qtkey-extension-client-protocol.h", + "^wayland-server-buffer-extension-client-protocol.h", + "^wayland-surface-extension-client-protocol.h", + "^wayland-text-input-unstable-v2-client-protocol.h", + "^wayland-touch-extension-client-protocol.h", + "^wayland-wayland-client-protocol.h", + "^wayland-xdg-shell-client-protocol.h", + "^wayland-xdg-shell-unstable-v6-client-protocol.h", + ], + "$basedir/src/compositor" => [ + "^qwayland-server-wayland.h", + "^qwayland-server-hardware-integration.h", + "^qwayland-server-ivi-application.h", + "^qwayland-server-qt-windowmanager.h", + "^qwayland-server-qtkey-extension.h", + "^qwayland-server-server-buffer-extension.h", + "^qwayland-server-text-input-unstable-v2.h", + "^qwayland-server-touch-extension.h", + "^qwayland-server-xdg-shell-unstable-v6.h", + "^qwayland-server-xdg-shell.h", + "^wayland-hardware-integration-server-protocol.h", + "^wayland-ivi-application-server-protocol.h", + "^wayland-qt-windowmanager-server-protocol.h", + "^wayland-qtkey-extension-server-protocol.h", + "^wayland-server-buffer-extension-server-protocol.h", + "^wayland-text-input-unstable-v2-server-protocol.h", + "^wayland-touch-extension-server-protocol.h", + "^wayland-wayland-server-protocol.h", + "^wayland-xdg-shell-server-protocol.h", + "^wayland-xdg-shell-unstable-v6-server-protocol.h", + ], +); +@private_headers = ( qr/^qwayland-.*\.h/, qr/^wayland-.*-protocol\.h/ ); |