From 9dbaed77586edafc16ee0b8fb1091005c62f0832 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 26 Sep 2018 10:50:22 +0300 Subject: qtlocation: rebase patch to remove build warnings Change-Id: Ibbc48b9d8dd0c41966e8acb71e065122ee36719f Reviewed-by: Mikko Gronoff --- ...001-location-disable-simulator-content-under-plugins.patch | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'meta-boot2qt-distro') 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 index ad4c7b8..b90d2f8 100644 --- 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 @@ -1,23 +1,24 @@ -From a7af02fe34bd8e067c7654ac366e19783b89e990 Mon Sep 17 00:00:00 2001 +From 5a68ac7a0121eff661a448e2fcbe5c02981c50a1 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff 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 1687a9d..347963f 100644 +index 4453b8a3..c36a1b58 100644 --- a/src/plugins/position/position.pro +++ b/src/plugins/position/position.pro -@@ -5,7 +5,7 @@ QT_FOR_CONFIG += positioning-private - qtHaveModule(dbus):SUBDIRS += geoclue +@@ -6,7 +6,7 @@ qtHaveModule(dbus):SUBDIRS += geoclue + 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 - win32:qtHaveModule(serialport):SUBDIRS += serialnmea + qtHaveModule(serialport):SUBDIRS += serialnmea -- cgit v1.2.3-54-g00ecf