location: remove obsolete patch

Change-Id: Iacad46425a64fc3605ccf014b92645a474a5a0f6
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>

2 files changed, 1 insertions, 27 deletions

diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtlocation/0001-location-disable-simulator-content-under-plugins.patch b/meta-boot2qt-distro/recipes-qt/qt5/qtlocation/0001-location-disable-simulator-content-under-plugins.patch
deleted file mode 100644
index c5e9fbf..0000000
--- a/meta-boot2qt-distro/recipes-qt/qt5/qtlocation/0001-location-disable-simulator-content-under-plugins.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 1362ec91854e9d56be56dc3556a9991eb3b17a5c Mon Sep 17 00:00:00 2001
-From: Mikko Gronoff <mikko.gronoff@qt.io>
-Date: Wed, 25 Oct 2017 13:22:16 +0300
-Subject: [PATCH] location: disable simulator content under plugins
-
-Does not build against more recent simulator
----
- src/plugins/position/position.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/plugins/position/position.pro b/src/plugins/position/position.pro
-index 6800d5a3..a6d3edba 100644
---- a/src/plugins/position/position.pro
-+++ b/src/plugins/position/position.pro
-@@ -6,7 +6,7 @@ linux:qtHaveModule(dbus):SUBDIRS += geoclue
- linux:qtHaveModule(dbus):SUBDIRS += geoclue2
- qtConfig(gypsy):SUBDIRS += gypsy
- qtConfig(winrt_geolocation):SUBDIRS += winrt
--qtHaveModule(simulator):SUBDIRS += simulator
-+#qtHaveModule(simulator):SUBDIRS += simulator
- osx|ios|tvos:SUBDIRS += corelocation
- android:SUBDIRS += android
- qtHaveModule(serialport):SUBDIRS += serialnmea
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtlocation_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/qtlocation_git.bbappend
index d6ee6a1..cdb7ce0 100644
--- a/meta-boot2qt-distro/recipes-qt/qt5/qtlocation_git.bbappend
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtlocation_git.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -29,6 +29,3 @@
 
 PACKAGECONFIG += "geoservices_mapboxgl"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://0001-location-disable-simulator-content-under-plugins.patch"