diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2020-07-02 12:17:25 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2020-07-03 11:28:23 +0200 |
| commit | 34f60f1fa28a904b592b33500240eca48eb4453e (patch) | |
| tree | d565537f2897f0eb961f6252d6efec0648121943 /src | |
| parent | 967542396991d6cdaf06e57410f7d1cb7191a611 (diff) | |
| download | qtwayland-34f60f1fa28a904b592b33500240eca48eb4453e.tar.gz | |
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 <alexandru.croitor@qt.io>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/client/configure.json | 10 | ||||
| -rw-r--r-- | src/compositor/configure.json | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ef145edd..8e60f0ba 100644 --- a/src/CMakeLists.txt +++ b/src/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/client/configure.json b/src/client/configure.json index e054f144..e799f834 100644 --- a/src/client/configure.json +++ b/src/client/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" diff --git a/src/compositor/configure.json b/src/compositor/configure.json index 46f68569..2fbe1489 100644 --- a/src/compositor/configure.json +++ b/src/compositor/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" |