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

Update libwayland requirement to 1.15.0

Browse Source 
[ChangeLog] libwayland 1.15.0 is now required.

Fixes: QTBUG-73636
Change-Id: I585bb80c7d14ebfceb623b55cf7959121121599f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
This commit is contained in:
Paul Olav Tvete 2020-07-02 12:17:25 +02:00
parent a15ab03734
commit 71eb32d328
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/platformsupport/wayland/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Generated from src.pro. # Generated from src.pro.
# special case begin # special case begin
qt_find_package(WaylandScanner PROVIDED_TARGETS Wayland::Scanner) qt_find_package(WaylandScanner PROVIDED_TARGETS Wayland::Scanner)
qt_find_package(Wayland PROVIDED_TARGETS Wayland::Client Wayland::Server) qt_find_package(Wayland 1.15 PROVIDED_TARGETS Wayland::Client Wayland::Server)
if (NOT WaylandScanner_FOUND OR NOT Wayland_FOUND) if (NOT WaylandScanner_FOUND OR NOT Wayland_FOUND)
message(WARNING "QtWayland is missing required dependencies, nothing will be built. \ message(WARNING "QtWayland is missing required dependencies, nothing will be built. \

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

@ -13,15 +13,15 @@
"test": { "test": {
"main": [ "main": [
"#if WAYLAND_VERSION_MAJOR < 1", "#if WAYLAND_VERSION_MAJOR < 1",
"# error Wayland 1.8.0 or higher required", "# error Wayland 1.15.0 or higher required",
"#endif", "#endif",
"#if WAYLAND_VERSION_MAJOR == 1", "#if WAYLAND_VERSION_MAJOR == 1",
"# if WAYLAND_VERSION_MINOR < 8", "# if WAYLAND_VERSION_MINOR < 15",
"# error Wayland 1.8.0 or higher required", "# error Wayland 1.15.0 or higher required",
"# endif", "# endif",
"# if WAYLAND_VERSION_MINOR == 8", "# if WAYLAND_VERSION_MINOR == 15",
"# if WAYLAND_VERSION_MICRO < 0", "# if WAYLAND_VERSION_MICRO < 0",
"# error Wayland 1.8.0 or higher required", "# error Wayland 1.15.0 or higher required",
"# endif", "# endif",
"# endif", "# endif",
"#endif" "#endif"