1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Client: Make features for shell integrations

Browse Source 
[ChangeLog][QPA plugin] Shell integrations are now features that can be enabled
or disabled at build time.

Change-Id: I1c48bb5d444074ac25331cb1ca8a9f49ebcd9805
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
This commit is contained in:
Johan Klokkhammer Helsing 2018-08-30 16:18:49 +02:00 committed by Johan Helsing
parent 088dc0556d
commit fc7eaa1ece
2 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/plugins/platforms/wayland/configure.json
View File

@ -81,6 +81,31 @@
"condition": "features.draganddrop || features.clipboard",
"output": [ "privateFeature" ]
},
"wayland-client-ivi-shell": {
"label": "ivi-shell",
"condition": "features.wayland-client",
"output": [ "privateFeature" ]
},
"wayland-client-wl-shell": {
"label": "wl-shell (deprecated)",
"condition": "features.wayland-client",
"output": [ "privateFeature" ]
},
"wayland-client-xdg-shell": {
"label": "xdg-shell",
"condition": "features.wayland-client",
"output": [ "privateFeature" ]
},
"wayland-client-xdg-shell-v5": {
"label": "xdg-shell unstable v5 (deprecated)",
"condition": "features.wayland-client",
"output": [ "privateFeature" ]
},
"wayland-client-xdg-shell-v6": {
"label": "xdg-shell unstable v6",
"condition": "features.wayland-client",
"output": [ "privateFeature" ]
},
"wayland-egl": {
"label": "EGL",
"condition": "features.wayland-client && features.opengl && features.egl && libs.wayland-egl",
@ -140,6 +165,17 @@
"wayland-shm-emulation-server-buffer"
]
},
{
"section": "Qt Wayland Client Shell Integrations",
"condition": "features.wayland-client",
"entries": [
"wayland-client-xdg-shell",
"wayland-client-xdg-shell-v5",
"wayland-client-xdg-shell-v6",
"wayland-client-ivi-shell",
"wayland-client-wl-shell"
]
},
"wayland-client"
]
}

13
src/plugins/platforms/wayland/plugins/shellintegration/shellintegration.pro
View File

@ -1,9 +1,8 @@
TEMPLATE = subdirs
QT_FOR_CONFIG += waylandclient-private
SUBDIRS += \
ivi-shell \
xdg-shell \
xdg-shell-v5 \
xdg-shell-v6 \
wl-shell \
qtConfig(wayland-client-ivi-shell): SUBDIRS += ivi-shell
qtConfig(wayland-client-wl-shell): SUBDIRS += wl-shell
qtConfig(wayland-client-xdg-shell): SUBDIRS += xdg-shell
qtConfig(wayland-client-xdg-shell-v5): SUBDIRS += xdg-shell-v5
qtConfig(wayland-client-xdg-shell-v6): SUBDIRS += xdg-shell-v6