From 71eb32d3280b920d3626c8b1bd204103012eff7b Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Thu, 2 Jul 2020 12:17:25 +0200 Subject: [PATCH] Update libwayland requirement to 1.15.0 [ChangeLog] libwayland 1.15.0 is now required. Fixes: QTBUG-73636 Change-Id: I585bb80c7d14ebfceb623b55cf7959121121599f Reviewed-by: Alexandru Croitor Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/platformsupport/wayland/CMakeLists.txt | 2 +- src/plugins/platforms/wayland/configure.json | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/platformsupport/wayland/CMakeLists.txt b/src/platformsupport/wayland/CMakeLists.txt index ef145edd45c..8e60f0ba8f5 100644 --- a/src/platformsupport/wayland/CMakeLists.txt +++ b/src/platformsupport/wayland/CMakeLists.txt @@ -1,7 +1,7 @@ # Generated from src.pro. # special case begin 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) message(WARNING "QtWayland is missing required dependencies, nothing will be built. \ diff --git a/src/plugins/platforms/wayland/configure.json b/src/plugins/platforms/wayland/configure.json index e054f144911..e799f8349ab 100644 --- a/src/plugins/platforms/wayland/configure.json +++ b/src/plugins/platforms/wayland/configure.json @@ -13,15 +13,15 @@ "test": { "main": [ "#if WAYLAND_VERSION_MAJOR < 1", - "# error Wayland 1.8.0 or higher required", + "# error Wayland 1.15.0 or higher required", "#endif", "#if WAYLAND_VERSION_MAJOR == 1", - "# if WAYLAND_VERSION_MINOR < 8", - "# error Wayland 1.8.0 or higher required", + "# if WAYLAND_VERSION_MINOR < 15", + "# error Wayland 1.15.0 or higher required", "# endif", - "# if WAYLAND_VERSION_MINOR == 8", + "# if WAYLAND_VERSION_MINOR == 15", "# if WAYLAND_VERSION_MICRO < 0", - "# error Wayland 1.8.0 or higher required", + "# error Wayland 1.15.0 or higher required", "# endif", "# endif", "#endif"