summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-11-06 21:31:51 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-11-06 21:37:26 (GMT)
commitec882377d66b4805b89af743f735afdffa464b69 (patch)
tree679f9e600065b465325b3dd073bea20058f05714
parentd059a6e31083568b464f5b0f80eede1e03e082a3 (diff)
Require Qt 5.7.0 for Android builds (Maps uses QuickControls2)
-rw-r--r--CMakeLists.txt6
-rw-r--r--src/apps/CMakeLists.txt4
2 files changed, 6 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04537ee..97183ce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,12 +77,12 @@ endif()
#######################################################
# Find Qt dependencies
-# Minimum Qt version
-set(REQUIRED_QT_VERSION 5.3.0)
-
if(CMAKE_SYSTEM_NAME STREQUAL Android)
+ set(REQUIRED_QT_VERSION 5.7.0)
# TODO: still needed with ECM toolchain?
SET(QT_QMAKE_EXECUTABLE "$ENV{Qt5_android}/bin/qmake")
+else()
+ set(REQUIRED_QT_VERSION 5.3.0)
endif()
find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED
diff --git a/src/apps/CMakeLists.txt b/src/apps/CMakeLists.txt
index 66a738f..4879a85 100644
--- a/src/apps/CMakeLists.txt
+++ b/src/apps/CMakeLists.txt
@@ -7,5 +7,7 @@ if(BUILD_MARBLE_APPS)
endif()
add_subdirectory(behaim)
- add_subdirectory(marble-maps)
+ if (NOT Qt5_VERSION VERSION_LESS 5.7.0)
+ add_subdirectory(marble-maps)
+ endif()
endif()