diff options
Diffstat (limited to 'meta-boot2qt-distro/recipes-qt/qt5')
-rw-r--r-- | meta-boot2qt-distro/recipes-qt/qt5/qtlocation/0001-location-disable-simulator-content-under-plugins.patch | 23 | ||||
-rw-r--r-- | meta-boot2qt-distro/recipes-qt/qt5/qtlocation_git.bbappend | 5 |
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 @@ | |||
1 | From 1362ec91854e9d56be56dc3556a9991eb3b17a5c Mon Sep 17 00:00:00 2001 | ||
2 | From: Mikko Gronoff <mikko.gronoff@qt.io> | ||
3 | Date: Wed, 25 Oct 2017 13:22:16 +0300 | ||
4 | Subject: [PATCH] location: disable simulator content under plugins | ||
5 | |||
6 | Does not build against more recent simulator | ||
7 | --- | ||
8 | src/plugins/position/position.pro | 2 +- | ||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
10 | |||
11 | diff --git a/src/plugins/position/position.pro b/src/plugins/position/position.pro | ||
12 | index 6800d5a3..a6d3edba 100644 | ||
13 | --- a/src/plugins/position/position.pro | ||
14 | +++ b/src/plugins/position/position.pro | ||
15 | @@ -6,7 +6,7 @@ linux:qtHaveModule(dbus):SUBDIRS += geoclue | ||
16 | linux:qtHaveModule(dbus):SUBDIRS += geoclue2 | ||
17 | qtConfig(gypsy):SUBDIRS += gypsy | ||
18 | qtConfig(winrt_geolocation):SUBDIRS += winrt | ||
19 | -qtHaveModule(simulator):SUBDIRS += simulator | ||
20 | +#qtHaveModule(simulator):SUBDIRS += simulator | ||
21 | osx|ios|tvos:SUBDIRS += corelocation | ||
22 | android:SUBDIRS += android | ||
23 | 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 @@ | |||
1 | ############################################################################ | 1 | ############################################################################ |
2 | ## | 2 | ## |
3 | ## Copyright (C) 2017 The Qt Company Ltd. | 3 | ## Copyright (C) 2019 The Qt Company Ltd. |
4 | ## Contact: https://www.qt.io/licensing/ | 4 | ## Contact: https://www.qt.io/licensing/ |
5 | ## | 5 | ## |
6 | ## This file is part of the Boot to Qt meta layer. | 6 | ## This file is part of the Boot to Qt meta layer. |
@@ -29,6 +29,3 @@ | |||
29 | 29 | ||
30 | PACKAGECONFIG += "geoservices_mapboxgl" | 30 | PACKAGECONFIG += "geoservices_mapboxgl" |
31 | 31 | ||
32 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
33 | |||
34 | SRC_URI += "file://0001-location-disable-simulator-content-under-plugins.patch" | ||