From 42f8428489692f0a4a05bf833478bad7ee8d5989 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sun, 14 May 2023 00:58:26 +0400 Subject: [PATCH] Wayland integration uses Qt 6.5 APIs now --- external/qt/package.cmake | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/external/qt/package.cmake b/external/qt/package.cmake index 8b0a0d8..cc16466 100644 --- a/external/qt/package.cmake +++ b/external/qt/package.cmake @@ -36,14 +36,16 @@ endif() find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui Widgets Network Svg REQUIRED) find_package(Qt${QT_VERSION_MAJOR} OPTIONAL_COMPONENTS Qml Quick QuickWidgets QUIET) -set(qt_version_6_or_greater 0) +set(qt_version_6_5_or_greater 0) if (QT_VERSION_MAJOR GREATER_EQUAL 6) - set(qt_version_6_or_greater 1) + if (QT_VERSION_MINOR GREATER_EQUAL 5) + set(qt_version_6_5_or_greater 1) + endif() find_package(Qt${QT_VERSION_MAJOR} COMPONENTS OpenGL OpenGLWidgets REQUIRED) endif() # QtWaylandScanner cmake integration from Qt 6 is used -cmake_dependent_option(DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION "Disable all code for Wayland integration." OFF "LINUX; qt_version_6_or_greater" ON) +cmake_dependent_option(DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION "Disable all code for Wayland integration." OFF "LINUX; qt_version_6_5_or_greater" ON) if (LINUX) if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)