Bump buildroot to 2019.02
This commit is contained in:
@@ -0,0 +1,48 @@
|
||||
From ad78b1a671edac369ede86bff376ec8af2cafbf2 Mon Sep 17 00:00:00 2001
|
||||
From: Giulio Benetti <giulio.benetti@micronovasrl.com>
|
||||
Date: Wed, 5 Sep 2018 12:51:41 +0200
|
||||
Subject: [PATCH] qdeclarativegeomap: fix building with GCC < 5.x
|
||||
|
||||
With GCC < 5.x implicit casts don't work as expected, in particular
|
||||
QPointer<QGeoMap> in m_map QDeclarativeGeoMap class when passed to
|
||||
connect(m_map, ...) should directly cast to m_map.data().
|
||||
|
||||
Workaround this using connect(m_map.data(), ...).
|
||||
|
||||
Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
|
||||
---
|
||||
src/location/declarativemaps/qdeclarativegeomap.cpp | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/location/declarativemaps/qdeclarativegeomap.cpp b/src/location/declarativemaps/qdeclarativegeomap.cpp
|
||||
index 09f9d01c..dc5a32ed 100644
|
||||
--- a/src/location/declarativemaps/qdeclarativegeomap.cpp
|
||||
+++ b/src/location/declarativemaps/qdeclarativegeomap.cpp
|
||||
@@ -694,11 +694,11 @@ void QDeclarativeGeoMap::mappingManagerInitialized()
|
||||
QImage copyrightImage;
|
||||
if (!m_initialized && width() > 0 && height() > 0) {
|
||||
QMetaObject::Connection copyrightStringCatcherConnection =
|
||||
- connect(m_map,
|
||||
+ connect(m_map.data(),
|
||||
QOverload<const QString &>::of(&QGeoMap::copyrightsChanged),
|
||||
[©rightString](const QString ©){ copyrightString = copy; });
|
||||
QMetaObject::Connection copyrightImageCatcherConnection =
|
||||
- connect(m_map,
|
||||
+ connect(m_map.data(),
|
||||
QOverload<const QImage &>::of(&QGeoMap::copyrightsChanged),
|
||||
[©rightImage](const QImage ©){ copyrightImage = copy; });
|
||||
m_map->setViewportSize(QSize(width(), height()));
|
||||
@@ -719,8 +719,8 @@ void QDeclarativeGeoMap::mappingManagerInitialized()
|
||||
emit m_map->copyrightsChanged(copyrightImage);
|
||||
|
||||
|
||||
- connect(m_map, &QGeoMap::sgNodeChanged, this, &QQuickItem::update);
|
||||
- connect(m_map, &QGeoMap::cameraCapabilitiesChanged, this, &QDeclarativeGeoMap::onCameraCapabilitiesChanged);
|
||||
+ connect(m_map.data(), &QGeoMap::sgNodeChanged, this, &QQuickItem::update);
|
||||
+ connect(m_map.data(), &QGeoMap::cameraCapabilitiesChanged, this, &QDeclarativeGeoMap::onCameraCapabilitiesChanged);
|
||||
|
||||
// This prefetches a buffer around the map
|
||||
m_map->prefetchData();
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
config BR2_PACKAGE_QT5LOCATION
|
||||
bool "qt5location"
|
||||
select BR2_PACKAGE_QT5BASE
|
||||
select BR2_PACKAGE_QT5BASE_GUI
|
||||
help
|
||||
Qt is a cross-platform application and UI framework for
|
||||
developers using C++.
|
||||
|
||||
@@ -1,13 +1,16 @@
|
||||
# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtlocation-opensource-src-5.6.3.tar.xz.mirrorlist
|
||||
sha256 b7a81c58cc331fb15bea8fba21d3c9a59f6dc6ad2e4855e30a14ce59a2af1466 qtlocation-opensource-src-5.6.3.tar.xz
|
||||
|
||||
# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtlocation-opensource-src-5.9.6.tar.xz.mirrorlist
|
||||
sha256 7d65c8e155c617719e2fb56d39f11cf2bc911a43cf6667c124d86cc1a12619c9 qtlocation-opensource-src-5.9.6.tar.xz
|
||||
# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtlocation-everywhere-src-5.11.3.tar.xz.sha256
|
||||
sha256 58e498a5b496e3a38925398b244bbd57ba68cbb482f2a0d2ae51572e037100eb qtlocation-everywhere-src-5.11.3.tar.xz
|
||||
|
||||
# Hashes for license files:
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
|
||||
sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
|
||||
sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
|
||||
sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
|
||||
sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
|
||||
sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
|
||||
sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
|
||||
sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
QT5LOCATION_VERSION = $(QT5_VERSION)
|
||||
QT5LOCATION_SITE = $(QT5_SITE)
|
||||
QT5LOCATION_SOURCE = qtlocation-opensource-src-$(QT5LOCATION_VERSION).tar.xz
|
||||
QT5LOCATION_SOURCE = qtlocation-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOCATION_VERSION).tar.xz
|
||||
QT5LOCATION_DEPENDENCIES = qt5base
|
||||
QT5LOCATION_INSTALL_STAGING = YES
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
|
||||
QT5LOCATION_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
|
||||
QT5LOCATION_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
|
||||
QT5LOCATION_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
|
||||
else
|
||||
QT5LOCATION_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
|
||||
QT5LOCATION_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
|
||||
@@ -44,6 +44,17 @@ define QT5LOCATION_INSTALL_TARGET_LOCATION
|
||||
cp -dpf $(STAGING_DIR)/usr/lib/libQt5Location.so.* $(TARGET_DIR)/usr/lib
|
||||
cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/geoservices $(TARGET_DIR)/usr/lib/qt/plugins/
|
||||
endef
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
|
||||
define QT5LOCATION_INSTALL_TARGET_POSITION_QUICK
|
||||
cp -dpf $(STAGING_DIR)/usr/lib/libQt5PositioningQuick.so.* $(TARGET_DIR)/usr/lib
|
||||
endef
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
|
||||
define QT5LOCATION_INSTALL_TARGET_EXAMPLES
|
||||
cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/location $(TARGET_DIR)/usr/lib/qt/examples/
|
||||
cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/positioning $(TARGET_DIR)/usr/lib/qt/examples/
|
||||
endef
|
||||
endif
|
||||
endif
|
||||
|
||||
define QT5LOCATION_INSTALL_TARGET_POSITION
|
||||
@@ -53,8 +64,10 @@ endef
|
||||
|
||||
define QT5LOCATION_INSTALL_TARGET_CMDS
|
||||
$(QT5LOCATION_INSTALL_TARGET_POSITION)
|
||||
$(QT5LOCATION_INSTALL_TARGET_POSITION_QUICK)
|
||||
$(QT5LOCATION_INSTALL_TARGET_LOCATION)
|
||||
$(QT5LOCATION_INSTALL_TARGET_QMLS)
|
||||
$(QT5LOCATION_INSTALL_TARGET_EXAMPLES)
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
|
||||
Reference in New Issue
Block a user