aboutsummaryrefslogtreecommitdiff
path: root/package/qt5/qt5location/5.11.3/0001-qdeclarativegeomap-fix-building-with-GCC-5.x.patch
diff options
context:
space:
mode:
Diffstat (limited to 'package/qt5/qt5location/5.11.3/0001-qdeclarativegeomap-fix-building-with-GCC-5.x.patch')
-rw-r--r--package/qt5/qt5location/5.11.3/0001-qdeclarativegeomap-fix-building-with-GCC-5.x.patch48
1 files changed, 0 insertions, 48 deletions
diff --git a/package/qt5/qt5location/5.11.3/0001-qdeclarativegeomap-fix-building-with-GCC-5.x.patch b/package/qt5/qt5location/5.11.3/0001-qdeclarativegeomap-fix-building-with-GCC-5.x.patch
deleted file mode 100644
index f893c33d50..0000000000
--- a/package/qt5/qt5location/5.11.3/0001-qdeclarativegeomap-fix-building-with-GCC-5.x.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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),
- [&copyrightString](const QString &copy){ copyrightString = copy; });
- QMetaObject::Connection copyrightImageCatcherConnection =
-- connect(m_map,
-+ connect(m_map.data(),
- QOverload<const QImage &>::of(&QGeoMap::copyrightsChanged),
- [&copyrightImage](const QImage &copy){ 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
-