mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

/: Corrected wrong Qt dependency from Kirigami

Browse source 
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 <jan@casacondor.com>
This commit is contained in:
jan Iversen 2019-11-14 13:29:35 +01:00 committed by Dirk Hohndel
parent b43ecdad4e
commit 685b92b9c2
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -251,8 +251,8 @@ set(QT_FIND_COMPONENTS Core Concurrent Widgets Network Svg Positioning Quick Loc
if (SUBSURFACE_TARGET_EXECUTABLE MATCHES "DesktopExecutable") if (SUBSURFACE_TARGET_EXECUTABLE MATCHES "DesktopExecutable")
find_package(Qt5 5.9.1 REQUIRED COMPONENTS ${QT_FIND_COMPONENTS} LinguistTools Test QuickTest) find_package(Qt5 5.9.1 REQUIRED COMPONENTS ${QT_FIND_COMPONENTS} LinguistTools Test QuickTest)
else() else()
# Kirigami 5.62 and newer require at least Qt 5.11 # Kirigami 5.62 and newer require at least Qt 5.12
find_package(Qt5 5.11 REQUIRED COMPONENTS ${QT_FIND_COMPONENTS} LinguistTools Test QuickTest) find_package(Qt5 5.12 REQUIRED COMPONENTS ${QT_FIND_COMPONENTS} LinguistTools Test QuickTest)
endif() endif()
foreach(_QT_COMPONENT ${QT_FIND_COMPONENTS}) foreach(_QT_COMPONENT ${QT_FIND_COMPONENTS})
list(APPEND QT_LIBRARIES Qt5::${_QT_COMPONENT}) list(APPEND QT_LIBRARIES Qt5::${_QT_COMPONENT})

4
INSTALL
View file

@ -62,8 +62,8 @@ Getting Qt5
We use Qt5 in order to only maintain one UI across platforms. 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.9.1 is the oldest version supported if ONLY building Subsurface
Qt5.11 is the oldest version supported if also building Subsurface-mobile (ios/android) Qt5.12 is the oldest version supported if also building Subsurface-mobile
Download the Open Source version from https://www.qt.io/download and Download the Open Source version from https://www.qt.io/download and
follow the Qt instructions to install it or alternatively follow the follow the Qt instructions to install it or alternatively follow the