Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-positioning for openSUSE:Factory
checked in at 2023-03-17 17:03:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-positioning (Old)
and /work/SRC/openSUSE:Factory/.qt6-positioning.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-positioning"
Fri Mar 17 17:03:15 2023 rev:11 rq:1072408 version:6.4.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt6-positioning/qt6-positioning.changes
2023-01-11 14:35:00.373214545 +0100
+++
/work/SRC/openSUSE:Factory/.qt6-positioning.new.31432/qt6-positioning.changes
2023-03-17 17:03:54.677570016 +0100
@@ -1,0 +2,6 @@
+Thu Mar 16 10:00:04 UTC 2023 - Christophe Marin <christo...@krop.fr>
+
+- Update to 6.4.3:
+ * https://www.qt.io/blog/qt-6.4.3-released
+
+-------------------------------------------------------------------
Old:
----
qtpositioning-everywhere-src-6.4.2.tar.xz
New:
----
qtpositioning-everywhere-src-6.4.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt6-positioning.spec ++++++
--- /var/tmp/diff_new_pack.RwMCNm/_old 2023-03-17 17:03:55.137572425 +0100
+++ /var/tmp/diff_new_pack.RwMCNm/_new 2023-03-17 17:03:55.141572446 +0100
@@ -16,7 +16,7 @@
#
-%define real_version 6.4.2
+%define real_version 6.4.3
%define short_version 6.4
%define tar_name qtpositioning-everywhere-src
%define tar_suffix %{nil}
@@ -27,7 +27,7 @@
%endif
#
Name: qt6-positioning%{?pkg_suffix}
-Version: 6.4.2
+Version: 6.4.3
Release: 0
Summary: Qt 6 Positioning plugins and libraries
License: GPL-3.0-or-later
@@ -168,10 +168,8 @@
# and also not for static plugins
rm -r %{buildroot}%{_qt6_cmakedir}/Qt6Bundled_Clip2Tri
-%post -n libQt6Positioning6 -p /sbin/ldconfig
-%post -n libQt6PositioningQuick6 -p /sbin/ldconfig
-%postun -n libQt6Positioning6 -p /sbin/ldconfig
-%postun -n libQt6PositioningQuick6 -p /sbin/ldconfig
+%ldconfig_scriptlets -n libQt6Positioning6
+%ldconfig_scriptlets -n libQt6PositioningQuick6
%files
%dir %{_qt6_pluginsdir}/position
++++++ qtpositioning-everywhere-src-6.4.2.tar.xz ->
qtpositioning-everywhere-src-6.4.3.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/.QT-ENTERPRISE-LICENSE-AGREEMENT
new/qtpositioning-everywhere-src-6.4.3/.QT-ENTERPRISE-LICENSE-AGREEMENT
--- old/qtpositioning-everywhere-src-6.4.2/.QT-ENTERPRISE-LICENSE-AGREEMENT
2022-12-13 08:05:06.260460400 +0100
+++ new/qtpositioning-everywhere-src-6.4.3/.QT-ENTERPRISE-LICENSE-AGREEMENT
2023-03-12 11:00:39.454241300 +0100
@@ -1061,6 +1061,7 @@
- Appendix 8: Intentionally left blank (optional)
- Appendix 9: Support Terms
- Appendix 10: Conversion from legacy Licenses to Subscription (optional)
+- Appendix 11: TERMS OF USE - QT INSIGHT TRACKER LIBRARY
APPENDIX 1: LICENSED SOFTWARE
@@ -1975,3 +1976,46 @@
will continue to make such payments in accordance with the applicable order
documentation, notwithstanding the fact that the Current Licenses are being
converted to Development Licenses pursuant to this Appendix.
+
+APPENDIX 11: TERMS OF USE - QT INSIGHT TRACKER LIBRARY
+Version 1.0
+
+Qt Insight Tracker Library ("Tracker Library") is a software module used to
+collect end user data from Customer's Application and Devices relating to The
+Qt Company's Qt Insight online service the Customer is ordering from The Qt
+Company under a separate service agreement ("Service Agreement").
+
+Unless otherwise set forth herein, definitions written in capital letters used
+herein shall have the meaning set forth in the Service Agreement.
+
+Subject to these terms The Qt Company grants to Customer a worldwide,
+non-exclusive, non-transferable, royalty-free, revocable (for cause) right and
+license, valid for the term of the Service Agreement, to
+ (i) use, copy and modify Tracker Library for the purpose of including it
+ into the Devices and Applications and solely for the purpose of being
+ used only in conjunction with Insight Cloud or Insight Private Cloud,
+ and
+ (ii) distribute, by itself or through its Contractors, Tracker Library as
+ installed, incorporated, or integrated into Applications and/or
+ Devices.
+
+Use of Tracker Library in a way or for the purpose other than the above is
+strictly prohibited. Tracker Library is licensed to the Customer in all
+respects "as is".
+
+TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE QT COMPANY ON BEHALF OF
+ITSELF AND ITS LICENSORS, SUPPLIERS AND AFFILIATES, DISCLAIMS ALL OTHER
+WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, ANY IMPLIED
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND
+NON-INFRINGEMENT WITH REGARD TO THE TRACKER LIBRARY. THE QT COMPANY DOES NOT
+WARRANT THAT THE TRACKER LIBRARY WILL SATISFY CUSTOMER'S REQUIREMENTS OR THAT
+IT WILL OPERATE WITHOUT DEFECT OR ERROR OR THAT THE OPERATION THEREOF WILL BE
+UNINTERRUPTED.
+IN NO EVENT SHALL THE QT COMPANY BE LIABLE TO THE CUSTOMER FOR ANY LOSS OF
+PROFIT, LOSS OF DATA, LOSS OF BUSINESS OR GOODWILL OR ANY OTHER INDIRECT,
+SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE COST, DAMAGES OR EXPENSE OF ANY
+KIND, HOWSOEVER ARISING UNDER OR IN CONNECTION WITH THE USE OF THE TRACKER
+LIBRARY.
+
+THE TOTAL MAXIMUM LIABILITY OF THE QT COMPANY UNDER THESE TERMS SHALL IN NO
+EVENT EXCEED 10,000 EUROS.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtpositioning-everywhere-src-6.4.2/.cmake.conf
new/qtpositioning-everywhere-src-6.4.3/.cmake.conf
--- old/qtpositioning-everywhere-src-6.4.2/.cmake.conf 2022-12-12
18:11:33.000000000 +0100
+++ new/qtpositioning-everywhere-src-6.4.3/.cmake.conf 2023-03-12
03:16:54.000000000 +0100
@@ -1,4 +1,4 @@
-set(QT_REPO_MODULE_VERSION "6.4.2")
+set(QT_REPO_MODULE_VERSION "6.4.3")
set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_LEAN_HEADERS=1")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtpositioning-everywhere-src-6.4.2/.qmake.conf
new/qtpositioning-everywhere-src-6.4.3/.qmake.conf
--- old/qtpositioning-everywhere-src-6.4.2/.qmake.conf 2022-12-12
18:11:33.000000000 +0100
+++ new/qtpositioning-everywhere-src-6.4.3/.qmake.conf 2023-03-12
03:16:54.000000000 +0100
@@ -3,4 +3,4 @@
DEFINES += QT_NO_JAVA_STYLE_ITERATORS
-MODULE_VERSION = 6.4.2
+MODULE_VERSION = 6.4.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtpositioning-everywhere-src-6.4.2/.tag
new/qtpositioning-everywhere-src-6.4.3/.tag
--- old/qtpositioning-everywhere-src-6.4.2/.tag 2022-12-12 18:11:33.000000000
+0100
+++ new/qtpositioning-everywhere-src-6.4.3/.tag 2023-03-12 03:16:54.000000000
+0100
@@ -1 +1 @@
-6d9979ac0c94006fbea7fe2a1633e09ccb14a441
+51714fa1531626627ee66afcb4a8ac8ec5997729
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtpositioning-everywhere-src-6.4.2/dependencies.yaml
new/qtpositioning-everywhere-src-6.4.3/dependencies.yaml
--- old/qtpositioning-everywhere-src-6.4.2/dependencies.yaml 2022-12-12
18:11:33.000000000 +0100
+++ new/qtpositioning-everywhere-src-6.4.3/dependencies.yaml 2023-03-12
03:16:54.000000000 +0100
@@ -1,10 +1,10 @@
dependencies:
../qtbase:
- ref: e3e40c44d3f998a433a6a1080297c5f28e9a768f
+ ref: 519d2d8f442409e86a0ee2fa16bd543342180861
required: true
../qtdeclarative:
- ref: 1b58f30087eedf42f16572d8ae1d6a5b18f3d698
+ ref: 7161b3a04d08aea891bd7c7e459437260d29c3f3
required: false
../qtserialport:
- ref: a29d4f9bb7f6145a6bfe0a0bb3889412a7032bfb
+ ref: 139e061de1825d032ef9632bf4e0f4244aadcf98
required: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/examples/positioning/geoflickr/CMakeLists.txt
new/qtpositioning-everywhere-src-6.4.3/examples/positioning/geoflickr/CMakeLists.txt
---
old/qtpositioning-everywhere-src-6.4.2/examples/positioning/geoflickr/CMakeLists.txt
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/examples/positioning/geoflickr/CMakeLists.txt
2023-03-12 03:16:54.000000000 +0100
@@ -10,6 +10,7 @@
set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/positioning/geoflickr")
find_package(Qt6 REQUIRED COMPONENTS Core Gui Network Positioning Qml Quick)
+find_package(Qt6 OPTIONAL_COMPONENTS SerialPort)
qt_add_executable(geoflickr
qmllocationflickr.cpp
@@ -29,6 +30,24 @@
Qt::Quick
)
+# For mobile platforms we need to explicitly link with Qt::SerialPort
+# to use NMEA plugin. The reason for such behavior is that, at least on
Android,
+# the plugin dependencies were not explicitly added to the list of deployment
+# targets until Qt 6.5.
+if(ANROID)
+ if (TARGET Qt::SerialPort)
+ target_link_libraries(geoflickr PRIVATE Qt::SerialPort)
+ endif()
+endif()
+
+if (IOS)
+ # Using absolute path for shared plist files is a Ninja bug workaround
+ get_filename_component(SHARED_PLIST_DIR
${CMAKE_CURRENT_SOURCE_DIR}/../shared ABSOLUTE)
+ set_target_properties(geoflickr PROPERTIES
+ MACOSX_BUNDLE_INFO_PLIST "${SHARED_PLIST_DIR}/Info.cmake.ios.plist"
+ )
+endif()
+
# Resources:
set(flickr_resource_files
"flickr-90.qml"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/examples/positioning/geoflickr/doc/src/geoflickr.qdoc
new/qtpositioning-everywhere-src-6.4.3/examples/positioning/geoflickr/doc/src/geoflickr.qdoc
---
old/qtpositioning-everywhere-src-6.4.2/examples/positioning/geoflickr/doc/src/geoflickr.qdoc
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/examples/positioning/geoflickr/doc/src/geoflickr.qdoc
2023-03-12 03:16:54.000000000 +0100
@@ -32,11 +32,19 @@
\snippet geoflickr/flickrmobile/GeoTab.qml possrc
- When the "Locate and update" button is pressed, we first interrogate
- the \l PositionSource to check if it has an available backend for
- positioning data. If it does not, we fall back to using a pre-recorded
- NMEA log for demonstration. We then instruct the \l PositionSource to
- request a location \l {QtPositioning::PositionSource::}{update}.
+ When the "Locate and update" button is pressed, we instruct the
+ \l PositionSource to request a location
+ \l {QtPositioning::PositionSource::}{update}. If the update finishes with
+ an error, we check if the default backend is capable of providing
+ positioning data. If it's not, we switch to \c {nmea} backend with
+ pre-recorded data, and request the location
+ \l {QtPositioning::PositionSource::}{update} again.
+
+ We cannot check the \l {PositionSource::}{supportedPositioningMethods} in
+ advance, because on mobile platforms (Android and iOS) this method will
+ return \c {NoPositioningMethods} before the permissions are granted.
+ And the permissions request is first performed when location update is
+ requested.
\snippet geoflickr/flickrmobile/GeoTab.qml locatebutton-top
\snippet geoflickr/flickrmobile/GeoTab.qml locatebutton-clicked
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/examples/positioning/geoflickr/flickrmobile/GeoTab.qml
new/qtpositioning-everywhere-src-6.4.3/examples/positioning/geoflickr/flickrmobile/GeoTab.qml
---
old/qtpositioning-everywhere-src-6.4.2/examples/positioning/geoflickr/flickrmobile/GeoTab.qml
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/examples/positioning/geoflickr/flickrmobile/GeoTab.qml
2023-03-12 03:16:54.000000000 +0100
@@ -43,11 +43,6 @@
y: 3; height: 32; width: parent.width - 10
//! [locatebutton-clicked]
onClicked: {
- if (positionSource.supportedPositioningMethods ===
- PositionSource.NoPositioningMethods) {
- positionSource.nmeaSource = "nmealog.txt";
- sourceText.text = "(filesource): " +
printableMethod(positionSource.supportedPositioningMethods);
- }
positionSource.update();
}
}
@@ -55,20 +50,27 @@
//! [possrc]
PositionSource {
id: positionSource
- onPositionChanged: { planet.source = "images/sun.png"; }
- onSourceErrorChanged: {
- if (sourceError == PositionSource.UpdateTimeoutError) {
- activityText.fadeOut = true
- return
- }
+ // used with nmea plugin only
+ PluginParameter { name: "nmea.source"; value:
"qrc:///flickrmobile/nmealog.txt" }
+
+ onPositionChanged: {
+ planet.source = "images/sun.png";
+ sourceText.text = ((name === "nmea") ? "(filesource): " : "Source:
") +
+ printableMethod(supportedPositioningMethods)
+ }
+ onSourceErrorChanged: {
if (sourceError == PositionSource.NoError)
return
- console.log("Source error: " + sourceError)
+ console.log("Source error: " + printableError(sourceError))
activityText.fadeOut = true
- stop()
+
+ if (supportedPositioningMethods ===
PositionSource.NoPositioningMethods) {
+ name = "nmea";
+ update();
+ }
}
}
//! [possrc]
@@ -83,6 +85,21 @@
return "Multiple"
return "source error";
}
+ function printableError(error) {
+ switch (error) {
+ case PositionSource.AccessError:
+ return qsTr("Not enough privileges")
+ case PositionSource.ClosedError:
+ return qsTr("Connection closed")
+ case PositionSource.UnknownSourceError:
+ return qsTr("Unknown error")
+ case PositionSource.NoError:
+ return qsTr("No error")
+ case PositionSource.UpdateTimeoutError:
+ return qsTr("Timeout occurred!")
+ }
+ return qsTr("Unknown error")
+ }
Grid {
id: locationGrid
@@ -120,7 +137,7 @@
text: {
if (fadeOut)
- return qsTr("Timeout occurred!");
+ return printableError(positionSource.sourceError)
else if (positionSource.active)
return qsTr("Retrieving update...")
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/examples/positioning/geoflickr/geoflickr.pro
new/qtpositioning-everywhere-src-6.4.3/examples/positioning/geoflickr/geoflickr.pro
---
old/qtpositioning-everywhere-src-6.4.2/examples/positioning/geoflickr/geoflickr.pro
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/examples/positioning/geoflickr/geoflickr.pro
2023-03-12 03:16:54.000000000 +0100
@@ -11,5 +11,13 @@
flickrcommon/* \
flickrmobile/*
+ios: QMAKE_INFO_PLIST = ../shared/Info.qmake.ios.plist
+
target.path = $$[QT_INSTALL_EXAMPLES]/positioning/geoflickr
INSTALLS += target
+
+android {
+ # explicitly link with serialport on mobile platforms in order to
+ # deploy it as a dependecy for nmea plugin
+ QT += serialport
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/examples/positioning/shared/Info.cmake.ios.plist
new/qtpositioning-everywhere-src-6.4.3/examples/positioning/shared/Info.cmake.ios.plist
---
old/qtpositioning-everywhere-src-6.4.2/examples/positioning/shared/Info.cmake.ios.plist
1970-01-01 01:00:00.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/examples/positioning/shared/Info.cmake.ios.plist
2023-03-12 03:16:54.000000000 +0100
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
"http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+<dict>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleIdentifier</key>
+ <string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
+ <key>CFBundleExecutable</key>
+ <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
+ <key>CFBundleVersion</key>
+ <string>0.0.1</string>
+ <key>CFBundleShortVersionString</key>
+ <string>0.0.1</string>
+ <key>CFBundleGetInfoString</key>
+ <string></string>
+ <key>NSHumanReadableCopyright</key>
+ <string></string>
+ <key>CFBundleIconFile</key>
+ <string>${MACOSX_BUNDLE_ICON_FILE}</string>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>LSRequiresIPhoneOS</key>
+ <true/>
+ <key>UILaunchStoryboardName</key>
+ <string>LaunchScreen</string>
+ <key>UISupportedInterfaceOrientations</key>
+ <array>
+ <string>UIInterfaceOrientationPortrait</string>
+ <string>UIInterfaceOrientationPortraitUpsideDown</string>
+ <string>UIInterfaceOrientationLandscapeLeft</string>
+ <string>UIInterfaceOrientationLandscapeRight</string>
+ </array>
+ <key>NSLocationWhenInUseUsageDescription</key>
+ <string>Qt positioning example wants to access your location</string>
+</dict>
+</plist>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/examples/positioning/shared/Info.qmake.ios.plist
new/qtpositioning-everywhere-src-6.4.3/examples/positioning/shared/Info.qmake.ios.plist
---
old/qtpositioning-everywhere-src-6.4.2/examples/positioning/shared/Info.qmake.ios.plist
1970-01-01 01:00:00.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/examples/positioning/shared/Info.qmake.ios.plist
2023-03-12 03:16:54.000000000 +0100
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
"http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+<dict>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleIdentifier</key>
+ <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
+ <key>CFBundleExecutable</key>
+ <string>$(EXECUTABLE_NAME)</string>
+ <key>CFBundleVersion</key>
+ <string>0.0.1</string>
+ <key>CFBundleShortVersionString</key>
+ <string>0.0.1</string>
+ <key>CFBundleGetInfoString</key>
+ <string></string>
+ <key>NSHumanReadableCopyright</key>
+ <string></string>
+ <key>CFBundleIconFile</key>
+ <string></string>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>LSRequiresIPhoneOS</key>
+ <true/>
+ <key>UILaunchStoryboardName</key>
+ <string>LaunchScreen</string>
+ <key>UISupportedInterfaceOrientations</key>
+ <array>
+ <string>UIInterfaceOrientationPortrait</string>
+ <string>UIInterfaceOrientationPortraitUpsideDown</string>
+ <string>UIInterfaceOrientationLandscapeLeft</string>
+ <string>UIInterfaceOrientationLandscapeRight</string>
+ </array>
+ <key>NSLocationWhenInUseUsageDescription</key>
+ <string>Qt positioning example wants to access your location</string>
+</dict>
+</plist>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/examples/positioning/weatherinfo/CMakeLists.txt
new/qtpositioning-everywhere-src-6.4.3/examples/positioning/weatherinfo/CMakeLists.txt
---
old/qtpositioning-everywhere-src-6.4.2/examples/positioning/weatherinfo/CMakeLists.txt
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/examples/positioning/weatherinfo/CMakeLists.txt
2023-03-12 03:16:54.000000000 +0100
@@ -33,6 +33,14 @@
Qt::Quick
)
+if (IOS)
+ # Using absolute path for shared plist files is a Ninja bug workaround
+ get_filename_component(SHARED_PLIST_DIR
${CMAKE_CURRENT_SOURCE_DIR}/../shared ABSOLUTE)
+ set_target_properties(weatherinfo PROPERTIES
+ MACOSX_BUNDLE_INFO_PLIST "${SHARED_PLIST_DIR}/Info.cmake.ios.plist"
+ )
+endif()
+
qt_add_qml_module(weatherinfo
URI WeatherInfo
VERSION 1.0
@@ -58,12 +66,6 @@
NO_RESOURCE_TARGET_PATH
)
-if(IOS)
- set_target_properties(weatherinfo PROPERTIES
- MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/ios/Info.plist"
- )
-endif()
-
install(TARGETS weatherinfo
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/examples/positioning/weatherinfo/icons/qt_attribution.json
new/qtpositioning-everywhere-src-6.4.3/examples/positioning/weatherinfo/icons/qt_attribution.json
---
old/qtpositioning-everywhere-src-6.4.2/examples/positioning/weatherinfo/icons/qt_attribution.json
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/examples/positioning/weatherinfo/icons/qt_attribution.json
2023-03-12 03:16:54.000000000 +0100
@@ -10,7 +10,7 @@
"License": "Public Domain",
"Copyright": "Copyright DarKobra (C Stark)",
- "Files": "weather-fog.png weather-haze.png weather-icy.png
weather-sleet.png weather-sunny.png weather-sunny-very-few-clouds.png
weather-sunny-few-clouds.png weather-thunder-shower.png"
+ "Files": "weather-fog.png weather-haze.png weather-icy.png
weather-sleet.png weather-sunny.png weather-sunny-very-few-clouds.png
weather-thundershower.png"
},
{
"Id": "weatherinfo-tango-icons",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/examples/positioning/weatherinfo/ios/Info.plist
new/qtpositioning-everywhere-src-6.4.3/examples/positioning/weatherinfo/ios/Info.plist
---
old/qtpositioning-everywhere-src-6.4.2/examples/positioning/weatherinfo/ios/Info.plist
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/examples/positioning/weatherinfo/ios/Info.plist
1970-01-01 01:00:00.000000000 +0100
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
"http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
-<plist version="1.0">
-<dict>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleIdentifier</key>
- <string>Anonymous.weatherinfo</string>
- <key>CFBundleExecutable</key>
- <string>$(EXECUTABLE_NAME)</string>
- <key>CFBundleVersion</key>
- <string>0.0.1</string>
- <key>CFBundleShortVersionString</key>
- <string>0.0.1</string>
- <key>CFBundleGetInfoString</key>
- <string></string>
- <key>NSHumanReadableCopyright</key>
- <string></string>
- <key>CFBundleIconFile</key>
- <string></string>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>LSRequiresIPhoneOS</key>
- <true/>
- <key>UILaunchStoryboardName</key>
- <string>LaunchScreen</string>
- <key>UISupportedInterfaceOrientations</key>
- <array>
- <string>UIInterfaceOrientationPortrait</string>
- <string>UIInterfaceOrientationPortraitUpsideDown</string>
- <string>UIInterfaceOrientationLandscapeLeft</string>
- <string>UIInterfaceOrientationLandscapeRight</string>
- </array>
- <key>NSLocationWhenInUseUsageDescription</key>
- <string>Location services needed to give local weather forecast</string>
-</dict>
-</plist>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/examples/positioning/weatherinfo/weatherinfo.pro
new/qtpositioning-everywhere-src-6.4.3/examples/positioning/weatherinfo/weatherinfo.pro
---
old/qtpositioning-everywhere-src-6.4.2/examples/positioning/weatherinfo/weatherinfo.pro
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/examples/positioning/weatherinfo/weatherinfo.pro
2023-03-12 03:16:54.000000000 +0100
@@ -19,9 +19,7 @@
components/BigForecastIcon.qml \
icons/*
-ios {
- QMAKE_INFO_PLIST = ios/Info.plist
-}
+ios: QMAKE_INFO_PLIST = ../shared/Info.qmake.ios.plist
RESOURCES += weatherinfo.qrc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qclipperutils_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qclipperutils_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qclipperutils_p.h
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qclipperutils_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/positioning/qclipperutils_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qdoublematrix4x4_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qdoublematrix4x4_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qdoublematrix4x4_p.h
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qdoublematrix4x4_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/positioning/qdoublematrix4x4_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qdoublevector2d_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qdoublevector2d_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qdoublevector2d_p.h
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qdoublevector2d_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/positioning/qdoublevector2d_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qdoublevector3d_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qdoublevector3d_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qdoublevector3d_p.h
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qdoublevector3d_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/positioning/qdoublevector3d_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qgeoaddress_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qgeoaddress_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qgeoaddress_p.h
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qgeoaddress_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/positioning/qgeoaddress_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qgeocircle_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qgeocircle_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qgeocircle_p.h
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qgeocircle_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/positioning/qgeocircle_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qgeocoordinate_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qgeocoordinate_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qgeocoordinate_p.h
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qgeocoordinate_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/positioning/qgeocoordinate_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qgeocoordinateobject_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qgeocoordinateobject_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qgeocoordinateobject_p.h
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qgeocoordinateobject_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/positioning/qgeocoordinateobject_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qgeolocation_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qgeolocation_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qgeolocation_p.h
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qgeolocation_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/positioning/qgeolocation_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qgeopath_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qgeopath_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qgeopath_p.h
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qgeopath_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/positioning/qgeopath_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qgeopolygon_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qgeopolygon_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qgeopolygon_p.h
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qgeopolygon_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/positioning/qgeopolygon_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qgeopositioninfo_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qgeopositioninfo_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qgeopositioninfo_p.h
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qgeopositioninfo_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/positioning/qgeopositioninfo_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qgeopositioninfosource_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qgeopositioninfosource_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qgeopositioninfosource_p.h
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qgeopositioninfosource_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/positioning/qgeopositioninfosource_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qgeorectangle_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qgeorectangle_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qgeorectangle_p.h
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qgeorectangle_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/positioning/qgeorectangle_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qgeosatelliteinfo_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qgeosatelliteinfo_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qgeosatelliteinfo_p.h
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qgeosatelliteinfo_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/positioning/qgeosatelliteinfo_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qgeosatelliteinfosource_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qgeosatelliteinfosource_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qgeosatelliteinfosource_p.h
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qgeosatelliteinfosource_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/positioning/qgeosatelliteinfosource_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qgeoshape_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qgeoshape_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qgeoshape_p.h
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qgeoshape_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/positioning/qgeoshape_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qlocationutils_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qlocationutils_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qlocationutils_p.h
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qlocationutils_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/positioning/qlocationutils_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qnmeapositioninfosource_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qnmeapositioninfosource_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qnmeapositioninfosource_p.h
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qnmeapositioninfosource_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/positioning/qnmeapositioninfosource_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qnmeasatelliteinfosource_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qnmeasatelliteinfosource_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qnmeasatelliteinfosource_p.h
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qnmeasatelliteinfosource_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/positioning/qnmeasatelliteinfosource_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qpositioningglobal_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qpositioningglobal_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qpositioningglobal_p.h
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qpositioningglobal_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/positioning/qpositioningglobal_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qwebmercator_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qwebmercator_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.2/QtPositioning/private/qwebmercator_p.h
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.2/QtPositioning/private/qwebmercator_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/positioning/qwebmercator_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qclipperutils_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qclipperutils_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qclipperutils_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qclipperutils_p.h
2023-03-12 03:16:54.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qclipperutils_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qdoublematrix4x4_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qdoublematrix4x4_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qdoublematrix4x4_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qdoublematrix4x4_p.h
2023-03-12 03:16:54.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qdoublematrix4x4_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qdoublevector2d_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qdoublevector2d_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qdoublevector2d_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qdoublevector2d_p.h
2023-03-12 03:16:54.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qdoublevector2d_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qdoublevector3d_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qdoublevector3d_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qdoublevector3d_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qdoublevector3d_p.h
2023-03-12 03:16:54.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qdoublevector3d_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qgeoaddress_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qgeoaddress_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qgeoaddress_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qgeoaddress_p.h
2023-03-12 03:16:54.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qgeoaddress_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qgeocircle_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qgeocircle_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qgeocircle_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qgeocircle_p.h
2023-03-12 03:16:54.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qgeocircle_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qgeocoordinate_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qgeocoordinate_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qgeocoordinate_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qgeocoordinate_p.h
2023-03-12 03:16:54.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qgeocoordinate_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qgeocoordinateobject_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qgeocoordinateobject_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qgeocoordinateobject_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qgeocoordinateobject_p.h
2023-03-12 03:16:54.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qgeocoordinateobject_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qgeolocation_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qgeolocation_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qgeolocation_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qgeolocation_p.h
2023-03-12 03:16:54.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qgeolocation_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qgeopath_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qgeopath_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qgeopath_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qgeopath_p.h
2023-03-12 03:16:54.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qgeopath_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qgeopolygon_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qgeopolygon_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qgeopolygon_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qgeopolygon_p.h
2023-03-12 03:16:54.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qgeopolygon_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qgeopositioninfo_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qgeopositioninfo_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qgeopositioninfo_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qgeopositioninfo_p.h
2023-03-12 03:16:54.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qgeopositioninfo_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qgeopositioninfosource_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qgeopositioninfosource_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qgeopositioninfosource_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qgeopositioninfosource_p.h
2023-03-12 03:16:54.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qgeopositioninfosource_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qgeorectangle_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qgeorectangle_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qgeorectangle_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qgeorectangle_p.h
2023-03-12 03:16:54.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qgeorectangle_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qgeosatelliteinfo_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qgeosatelliteinfo_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qgeosatelliteinfo_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qgeosatelliteinfo_p.h
2023-03-12 03:16:54.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qgeosatelliteinfo_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qgeosatelliteinfosource_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qgeosatelliteinfosource_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qgeosatelliteinfosource_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qgeosatelliteinfosource_p.h
2023-03-12 03:16:54.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qgeosatelliteinfosource_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qgeoshape_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qgeoshape_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qgeoshape_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qgeoshape_p.h
2023-03-12 03:16:54.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qgeoshape_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qlocationutils_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qlocationutils_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qlocationutils_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qlocationutils_p.h
2023-03-12 03:16:54.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qlocationutils_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qnmeapositioninfosource_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qnmeapositioninfosource_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qnmeapositioninfosource_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qnmeapositioninfosource_p.h
2023-03-12 03:16:54.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qnmeapositioninfosource_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qnmeasatelliteinfosource_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qnmeasatelliteinfosource_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qnmeasatelliteinfosource_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qnmeasatelliteinfosource_p.h
2023-03-12 03:16:54.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qnmeasatelliteinfosource_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qpositioningglobal_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qpositioningglobal_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qpositioningglobal_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qpositioningglobal_p.h
2023-03-12 03:16:54.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qpositioningglobal_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qwebmercator_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qwebmercator_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/6.4.3/QtPositioning/private/qwebmercator_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/6.4.3/QtPositioning/private/qwebmercator_p.h
2023-03-12 03:16:54.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qwebmercator_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/qtpositioningversion.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/qtpositioningversion.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioning/qtpositioningversion.h
2022-12-13 08:05:05.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioning/qtpositioningversion.h
2023-03-12 11:00:39.434241000 +0100
@@ -2,8 +2,8 @@
#ifndef QT_QTPOSITIONING_VERSION_H
#define QT_QTPOSITIONING_VERSION_H
-#define QTPOSITIONING_VERSION_STR "6.4.2"
+#define QTPOSITIONING_VERSION_STR "6.4.3"
-#define QTPOSITIONING_VERSION 0x060402
+#define QTPOSITIONING_VERSION 0x060403
#endif // QT_QTPOSITIONING_VERSION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/locationsingleton_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/locationsingleton_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/locationsingleton_p.h
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/locationsingleton_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/positioningquick/locationsingleton_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qdeclarativegeoaddress_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qdeclarativegeoaddress_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qdeclarativegeoaddress_p.h
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qdeclarativegeoaddress_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/positioningquick/qdeclarativegeoaddress_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qdeclarativegeolocation_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qdeclarativegeolocation_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qdeclarativegeolocation_p.h
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qdeclarativegeolocation_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/positioningquick/qdeclarativegeolocation_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qdeclarativepluginparameter_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qdeclarativepluginparameter_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qdeclarativepluginparameter_p.h
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qdeclarativepluginparameter_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/positioningquick/qdeclarativepluginparameter_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qdeclarativeposition_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qdeclarativeposition_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qdeclarativeposition_p.h
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qdeclarativeposition_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/positioningquick/qdeclarativeposition_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qdeclarativepositionsource_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qdeclarativepositionsource_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qdeclarativepositionsource_p.h
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qdeclarativepositionsource_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/positioningquick/qdeclarativepositionsource_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qpositioningquickglobal_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qpositioningquickglobal_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qpositioningquickglobal_p.h
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qpositioningquickglobal_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/positioningquick/qpositioningquickglobal_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qpositioningquickmodule_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qpositioningquickmodule_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qpositioningquickmodule_p.h
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qpositioningquickmodule_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/positioningquick/qpositioningquickmodule_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qquickgeocoordinateanimation_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qquickgeocoordinateanimation_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qquickgeocoordinateanimation_p.h
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qquickgeocoordinateanimation_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/positioningquick/qquickgeocoordinateanimation_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qquickgeocoordinateanimation_p_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qquickgeocoordinateanimation_p_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qquickgeocoordinateanimation_p_p.h
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.2/QtPositioningQuick/private/qquickgeocoordinateanimation_p_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include
"../../../../../src/positioningquick/qquickgeocoordinateanimation_p_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/locationsingleton_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/locationsingleton_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/locationsingleton_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/locationsingleton_p.h
2023-03-12 03:16:54.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/positioningquick/locationsingleton_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qdeclarativegeoaddress_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qdeclarativegeoaddress_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qdeclarativegeoaddress_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qdeclarativegeoaddress_p.h
2023-03-12 03:16:54.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/positioningquick/qdeclarativegeoaddress_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qdeclarativegeolocation_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qdeclarativegeolocation_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qdeclarativegeolocation_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qdeclarativegeolocation_p.h
2023-03-12 03:16:54.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/positioningquick/qdeclarativegeolocation_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qdeclarativepluginparameter_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qdeclarativepluginparameter_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qdeclarativepluginparameter_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qdeclarativepluginparameter_p.h
2023-03-12 03:16:54.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/positioningquick/qdeclarativepluginparameter_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qdeclarativeposition_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qdeclarativeposition_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qdeclarativeposition_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qdeclarativeposition_p.h
2023-03-12 03:16:54.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/positioningquick/qdeclarativeposition_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qdeclarativepositionsource_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qdeclarativepositionsource_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qdeclarativepositionsource_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qdeclarativepositionsource_p.h
2023-03-12 03:16:54.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/positioningquick/qdeclarativepositionsource_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qpositioningquickglobal_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qpositioningquickglobal_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qpositioningquickglobal_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qpositioningquickglobal_p.h
2023-03-12 03:16:54.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/positioningquick/qpositioningquickglobal_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qpositioningquickmodule_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qpositioningquickmodule_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qpositioningquickmodule_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qpositioningquickmodule_p.h
2023-03-12 03:16:54.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/positioningquick/qpositioningquickmodule_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qquickgeocoordinateanimation_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qquickgeocoordinateanimation_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qquickgeocoordinateanimation_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qquickgeocoordinateanimation_p.h
2023-03-12 03:16:54.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/positioningquick/qquickgeocoordinateanimation_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qquickgeocoordinateanimation_p_p.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qquickgeocoordinateanimation_p_p.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qquickgeocoordinateanimation_p_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/6.4.3/QtPositioningQuick/private/qquickgeocoordinateanimation_p_p.h
2023-03-12 03:16:54.000000000 +0100
@@ -0,0 +1 @@
+#include
"../../../../../src/positioningquick/qquickgeocoordinateanimation_p_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/qtpositioningquickversion.h
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/qtpositioningquickversion.h
---
old/qtpositioning-everywhere-src-6.4.2/include/QtPositioningQuick/qtpositioningquickversion.h
2022-12-13 08:05:05.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/include/QtPositioningQuick/qtpositioningquickversion.h
2023-03-12 11:00:39.442241200 +0100
@@ -2,8 +2,8 @@
#ifndef QT_QTPOSITIONINGQUICK_VERSION_H
#define QT_QTPOSITIONINGQUICK_VERSION_H
-#define QTPOSITIONINGQUICK_VERSION_STR "6.4.2"
+#define QTPOSITIONINGQUICK_VERSION_STR "6.4.3"
-#define QTPOSITIONINGQUICK_VERSION 0x060402
+#define QTPOSITIONINGQUICK_VERSION 0x060403
#endif // QT_QTPOSITIONINGQUICK_VERSION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/src/plugins/position/android/src/jnipositioning.cpp
new/qtpositioning-everywhere-src-6.4.3/src/plugins/position/android/src/jnipositioning.cpp
---
old/qtpositioning-everywhere-src-6.4.2/src/plugins/position/android/src/jnipositioning.cpp
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/src/plugins/position/android/src/jnipositioning.cpp
2023-03-12 03:16:54.000000000 +0100
@@ -612,11 +612,10 @@
return;
}
- QMetaObject::invokeMethod(source, "processSatelliteUpdateInView",
Qt::AutoConnection,
- Q_ARG(QList<QGeoSatelliteInfo>, inView),
Q_ARG(bool, isSingleUpdate));
-
- QMetaObject::invokeMethod(source, "processSatelliteUpdateInUse",
Qt::AutoConnection,
- Q_ARG(QList<QGeoSatelliteInfo>, inUse),
Q_ARG(bool, isSingleUpdate));
+ QMetaObject::invokeMethod(source, "processSatelliteUpdate",
Qt::AutoConnection,
+ Q_ARG(QList<QGeoSatelliteInfo>, inView),
+ Q_ARG(QList<QGeoSatelliteInfo>, inUse),
+ Q_ARG(bool, isSingleUpdate));
}
static void satelliteGpsUpdated(JNIEnv *env, jobject thiz, jobjectArray
satellites,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/src/plugins/position/android/src/qgeopositioninfosource_android.cpp
new/qtpositioning-everywhere-src-6.4.3/src/plugins/position/android/src/qgeopositioninfosource_android.cpp
---
old/qtpositioning-everywhere-src-6.4.2/src/plugins/position/android/src/qgeopositioninfosource_android.cpp
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/src/plugins/position/android/src/qgeopositioninfosource_android.cpp
2023-03-12 03:16:54.000000000 +0100
@@ -176,6 +176,17 @@
return;
queuedSingleUpdates.append(pInfo);
+ // Calculate the maximum amount of possibly received updates. It depends on
+ // preferred positioning methods. Two updates if we have both Satellite and
+ // Network, and only one otherwise.
+ const qsizetype maxPossibleUpdates =
+ (preferredPositioningMethods() ==
QGeoPositionInfoSource::AllPositioningMethods)
+ ? 2 : 1;
+ // If we get the maximum number of updates, we do not need to wait for more
+ if (queuedSingleUpdates.size() == maxPossibleUpdates) {
+ m_requestTimer.stop();
+ requestTimeout();
+ }
}
void QGeoPositionInfoSourceAndroid::locationProviderDisabled()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/src/plugins/position/android/src/qgeosatelliteinfosource_android.cpp
new/qtpositioning-everywhere-src-6.4.3/src/plugins/position/android/src/qgeosatelliteinfosource_android.cpp
---
old/qtpositioning-everywhere-src-6.4.2/src/plugins/position/android/src/qgeosatelliteinfosource_android.cpp
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/src/plugins/position/android/src/qgeosatelliteinfosource_android.cpp
2023-03-12 03:16:54.000000000 +0100
@@ -118,37 +118,34 @@
}
}
-void QGeoSatelliteInfoSourceAndroid::processSatelliteUpdateInView(const
QList<QGeoSatelliteInfo> &satsInView, bool isSingleUpdate)
+void
+QGeoSatelliteInfoSourceAndroid::processSatelliteUpdate(const
QList<QGeoSatelliteInfo> &satsInView,
+ const
QList<QGeoSatelliteInfo> &satsInUse,
+ bool isSingleUpdate)
{
if (!isSingleUpdate) {
- //if requested while regular updates were running
+ //if single update is requested while regular updates are running
if (requestTimer.isActive())
requestTimer.stop();
emit QGeoSatelliteInfoSource::satellitesInViewUpdated(satsInView);
+ emit QGeoSatelliteInfoSource::satellitesInUseUpdated(satsInUse);
return;
}
m_satsInView = satsInView;
-}
+ m_satsInUse = satsInUse;
-void QGeoSatelliteInfoSourceAndroid::processSatelliteUpdateInUse(const
QList<QGeoSatelliteInfo> &satsInUse, bool isSingleUpdate)
-{
- if (!isSingleUpdate) {
- //if requested while regular updates were running
- if (requestTimer.isActive())
- requestTimer.stop();
- emit QGeoSatelliteInfoSource::satellitesInUseUpdated(satsInUse);
- return;
+ if (!m_satsInView.isEmpty() || !m_satsInUse.isEmpty()) {
+ requestTimer.stop();
+ requestTimeout();
}
-
- m_satsInUse = satsInUse;
}
void QGeoSatelliteInfoSourceAndroid::requestTimeout()
{
AndroidPositioning::stopUpdates(androidClassKeyForSingleRequest);
- if (m_satsInView.isEmpty()) {
+ if (m_satsInView.isEmpty() && m_satsInUse.isEmpty()) {
setError(QGeoSatelliteInfoSource::UpdateTimeoutError);
return;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/src/plugins/position/android/src/qgeosatelliteinfosource_android_p.h
new/qtpositioning-everywhere-src-6.4.3/src/plugins/position/android/src/qgeosatelliteinfosource_android_p.h
---
old/qtpositioning-everywhere-src-6.4.2/src/plugins/position/android/src/qgeosatelliteinfosource_android_p.h
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/src/plugins/position/android/src/qgeosatelliteinfosource_android_p.h
2023-03-12 03:16:54.000000000 +0100
@@ -37,8 +37,9 @@
void stopUpdates() override;
void requestUpdate(int timeout = 0) override;
- void processSatelliteUpdateInView(const QList<QGeoSatelliteInfo>
&satsInView, bool isSingleUpdate);
- void processSatelliteUpdateInUse(const QList<QGeoSatelliteInfo>
&satsInUse, bool isSingleUpdate);
+ void processSatelliteUpdate(const QList<QGeoSatelliteInfo> &satsInView,
+ const QList<QGeoSatelliteInfo> &satsInUse,
+ bool isSingleUpdate);
void locationProviderDisabled();
private Q_SLOTS:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtpositioning-everywhere-src-6.4.2/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp
new/qtpositioning-everywhere-src-6.4.3/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp
---
old/qtpositioning-everywhere-src-6.4.2/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp
2022-12-12 18:11:33.000000000 +0100
+++
new/qtpositioning-everywhere-src-6.4.3/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp
2023-03-12 03:16:54.000000000 +0100
@@ -859,6 +859,9 @@
void multipleThreads()
{
+#if defined(Q_OS_MACOS) && defined(Q_PROCESSOR_ARM)
+ QSKIP("This test randomly hangs on macOS ARM (QTBUG-110931)");
+#endif
std::unique_ptr<QGeoAreaMonitorSource> obj(
QGeoAreaMonitorSource::createSource(QStringLiteral("positionpoll"), 0));
QVERIFY(obj != nullptr);
