summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Müller-Klieser <S.Mueller-Klieser@phytec.de>2018-01-31 11:41:58 (GMT)
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2018-01-31 11:46:07 (GMT)
commit8121f1d336c577b6d76c21aa65eda518ad6f1386 (patch)
treebf4efc0d954a69aecbba76eb8dc67df2f7efe347
parentb0ccb6fe6eda064a04d2a8ac5ba86916ed43faf5 (diff)
downloadmeta-yogurt-8121f1d336c577b6d76c21aa65eda518ad6f1386.zip
meta-yogurt-8121f1d336c577b6d76c21aa65eda518ad6f1386.tar.bz2
Revert "qtlocation: fix compilation on armv7"2.1.3-phy5
This reverts commit f9b8a58212b24b341c8c8e1030215e9412eb070a. Fixed upstream with stable upgrade. Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
-rw-r--r--recipes-qt/qt5/qtlocation/0001-qdeclarativegeomap-fix-compilation-on-armv7.patch34
-rw-r--r--recipes-qt/qt5/qtlocation_%.bbappend5
2 files changed, 0 insertions, 39 deletions
diff --git a/recipes-qt/qt5/qtlocation/0001-qdeclarativegeomap-fix-compilation-on-armv7.patch b/recipes-qt/qt5/qtlocation/0001-qdeclarativegeomap-fix-compilation-on-armv7.patch
deleted file mode 100644
index b01993a..0000000
--- a/recipes-qt/qt5/qtlocation/0001-qdeclarativegeomap-fix-compilation-on-armv7.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 8ec7147033e3deea6006c2c445fe3ed3bc9fe17d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefan=20M=C3=BCller-Klieser?= <s.mueller-klieser@phytec.de>
-Date: Thu, 10 Nov 2016 17:15:50 +0100
-Subject: [PATCH] qdeclarativegeomap: fix compilation on armv7
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
----
- src/imports/location/qdeclarativegeomap.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp
-index ad2b78d..8a02910 100644
---- a/src/imports/location/qdeclarativegeomap.cpp
-+++ b/src/imports/location/qdeclarativegeomap.cpp
-@@ -885,11 +885,11 @@ void QDeclarativeGeoMap::fitViewportToGeoShape()
- if (bboxHeight == 0 && bboxWidth == 0)
- return;
-
-- double zoomRatio = qMax(bboxWidth / (width() - margins),
-+ qreal zoomRatio = qMax(bboxWidth / (width() - margins),
- bboxHeight / (height() - margins));
- // fixme: use log2 with c++11
- zoomRatio = std::log(zoomRatio) / std::log(2.0);
-- double newZoom = qMax(minimumZoomLevel(), m_map->mapController()->zoom()
-+ qreal newZoom = qMax(minimumZoomLevel(), m_map->mapController()->zoom()
- - zoomRatio);
- setZoomLevel(newZoom);
- m_validRegion = true;
---
-1.9.1
-
diff --git a/recipes-qt/qt5/qtlocation_%.bbappend b/recipes-qt/qt5/qtlocation_%.bbappend
deleted file mode 100644
index 9a0247a..0000000
--- a/recipes-qt/qt5/qtlocation_%.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "\
- file://0001-qdeclarativegeomap-fix-compilation-on-armv7.patch \
-"