qt5charts: allow to build with qt5.6
authorGaël PORTAY <gael.portay@savoirfairelinux.com>
Mon, 18 Jun 2018 22:49:06 +0000 (18:49 -0400)
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>
Mon, 25 Jun 2018 20:02:55 +0000 (22:02 +0200)
This module is available for Qt 5.6 since version 5.6.3 under the
version number 2.1.3.

Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
package/qt5/qt5charts/Config.in
package/qt5/qt5charts/qt5charts.hash
package/qt5/qt5charts/qt5charts.mk

index 78f08fe63798079311bb1c93ef716f774adc587d..db199922db79d76a559b33473e4262858385f55b 100644 (file)
@@ -1,9 +1,5 @@
-comment "qt5charts needs at least qt-5.7"
-       depends on !BR2_PACKAGE_QT5_VERSION_LATEST
-
 config BR2_PACKAGE_QT5CHARTS
        bool "qt5charts"
-       depends on BR2_PACKAGE_QT5_VERSION_LATEST
        select BR2_PACKAGE_QT5BASE
        select BR2_PACKAGE_QT5BASE_GUI
        select BR2_PACKAGE_QT5BASE_WIDGETS
index 5a5845ef9f4623703e963258c1015ca8b35d0d71..ce1189d0e101ef124be53f2c6f8e3beeb61d092a 100644 (file)
@@ -1,3 +1,6 @@
+# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtcharts-opensource-src-2.1.3.tar.xz.mirrorlist
+sha256 f636a9b1c255f678f11b36cd73abc807d16dae0c31ecbc75c09524703aae7d2f  qtcharts-opensource-src-2.1.3.tar.xz
+
 # Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtcharts-everywhere-src-5.10.1.tar.xz.mirrorlist
 sha256 4f0d577bf73dd2bbb2765c2cfb493a2d68790fc2c64f42544d31dba806321ec9  qtcharts-everywhere-src-5.10.1.tar.xz
 
index 123cb658fe482537517cda03b3c7826b3abf1d32..71d0e54027dea2717a1c82599d0d4543af2471a8 100644 (file)
@@ -4,7 +4,12 @@
 #
 ################################################################################
 
+# Qt5Charts does not follow Qt versionning for 5.6
+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
 QT5CHARTS_VERSION = $(QT5_VERSION)
+else
+QT5CHARTS_VERSION = 2.1.3
+endif
 QT5CHARTS_SITE = $(QT5_SITE)
 QT5CHARTS_SOURCE = qtcharts-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CHARTS_VERSION).tar.xz
 QT5CHARTS_DEPENDENCIES = qt5base