From 685b92b9c2ddd6575ae5df7c95b928e60fcd7005 Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Thu, 14 Nov 2019 13:29:35 +0100 Subject: [PATCH] /: Corrected wrong Qt dependency from Kirigami Kirigami 5.62 uses QtQuick.Controls 2.5, which were introduced in Qt 5.12 (see https://doc.qt.io/qt-5/qtquickcontrols-index.html) update CMakeList.txt to demand min. 5.12 when building SUBSURFACE-MOBILE update INSTALL text Signed-off-by: Jan Iversen --- CMakeLists.txt | 4 ++-- INSTALL | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d618106d8..2d6a33126 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -251,8 +251,8 @@ set(QT_FIND_COMPONENTS Core Concurrent Widgets Network Svg Positioning Quick Loc if (SUBSURFACE_TARGET_EXECUTABLE MATCHES "DesktopExecutable") find_package(Qt5 5.9.1 REQUIRED COMPONENTS ${QT_FIND_COMPONENTS} LinguistTools Test QuickTest) else() - # Kirigami 5.62 and newer require at least Qt 5.11 - find_package(Qt5 5.11 REQUIRED COMPONENTS ${QT_FIND_COMPONENTS} LinguistTools Test QuickTest) + # Kirigami 5.62 and newer require at least Qt 5.12 + find_package(Qt5 5.12 REQUIRED COMPONENTS ${QT_FIND_COMPONENTS} LinguistTools Test QuickTest) endif() foreach(_QT_COMPONENT ${QT_FIND_COMPONENTS}) list(APPEND QT_LIBRARIES Qt5::${_QT_COMPONENT}) diff --git a/INSTALL b/INSTALL index 46fbfd367..52b05cf2b 100644 --- a/INSTALL +++ b/INSTALL @@ -62,8 +62,8 @@ Getting Qt5 We use Qt5 in order to only maintain one UI across platforms. -Qt5.9.1 is the oldest version supported if ONLY building Subsurface (desktop version) -Qt5.11 is the oldest version supported if also building Subsurface-mobile (ios/android) +Qt5.9.1 is the oldest version supported if ONLY building Subsurface +Qt5.12 is the oldest version supported if also building Subsurface-mobile Download the Open Source version from https://www.qt.io/download and follow the Qt instructions to install it or alternatively follow the