commit qt6-location for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-location for openSUSE:Factory checked in at 2024-03-28 13:54:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-location (Old) and /work/SRC/openSUSE:Factory/.qt6-location.new.1905 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt6-location" Thu Mar 28 13:54:19 2024 rev:10 rq:1162380 version:6.6.3 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-location/qt6-location.changes 2024-02-18 20:24:16.368399481 +0100 +++ /work/SRC/openSUSE:Factory/.qt6-location.new.1905/qt6-location.changes 2024-03-28 14:21:27.661263456 +0100 @@ -1,0 +2,6 @@ +Tue Mar 26 14:25:55 UTC 2024 - Christophe Marin <christophe@krop.fr> + +- Update to 6.6.3: + * https://www.qt.io/blog/qt-6.6.3-released + +------------------------------------------------------------------- Old: ---- qtlocation-everywhere-src-6.6.2.tar.xz New: ---- qtlocation-everywhere-src-6.6.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-location.spec ++++++ --- /var/tmp/diff_new_pack.Piuknt/_old 2024-03-28 14:21:38.657667943 +0100 +++ /var/tmp/diff_new_pack.Piuknt/_new 2024-03-28 14:21:38.657667943 +0100 @@ -16,7 +16,7 @@ # -%define real_version 6.6.2 +%define real_version 6.6.3 %define short_version 6.6 %define tar_name qtlocation-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-location%{?pkg_suffix} -Version: 6.6.2 +Version: 6.6.3 Release: 0 Summary: Qt 6 Location plugins and libraries License: GPL-3.0-or-later ++++++ qtlocation-everywhere-src-6.6.2.tar.xz -> qtlocation-everywhere-src-6.6.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.6.2/.cmake.conf new/qtlocation-everywhere-src-6.6.3/.cmake.conf --- old/qtlocation-everywhere-src-6.6.2/.cmake.conf 2024-02-09 23:39:30.000000000 +0100 +++ new/qtlocation-everywhere-src-6.6.3/.cmake.conf 2024-03-19 02:59:08.000000000 +0100 @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.6.2") +set(QT_REPO_MODULE_VERSION "6.6.3") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.6.2/.tag new/qtlocation-everywhere-src-6.6.3/.tag --- old/qtlocation-everywhere-src-6.6.2/.tag 2024-02-09 23:39:30.000000000 +0100 +++ new/qtlocation-everywhere-src-6.6.3/.tag 2024-03-19 02:59:08.000000000 +0100 @@ -1 +1 @@ -5dfd658464ee3a6f844ccbc99f1999965b684eaa +0bb0e7bab232ba0832619ff3397040d25677b0f5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.6.2/dependencies.yaml new/qtlocation-everywhere-src-6.6.3/dependencies.yaml --- old/qtlocation-everywhere-src-6.6.2/dependencies.yaml 2024-02-09 23:39:30.000000000 +0100 +++ new/qtlocation-everywhere-src-6.6.3/dependencies.yaml 2024-03-19 02:59:08.000000000 +0100 @@ -1,10 +1,10 @@ dependencies: ../qtbase: - ref: dec1863c7dc63e5788b0c6c061d36e856a6ae2b2 + ref: afdec885058c92e24604f398a926297222da06f3 required: true ../qtdeclarative: - ref: b3d82373ac90e54ad4cbab0c16709a19a9441beb + ref: ab5521fd1a637739c7e91def84caa84426055aff required: true ../qtpositioning: - ref: 892867ff97a300a158dc37cded2ebb1c777fc310 + ref: 31cc09838d78da554afea162ea5a94bb45e489c6 required: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.6.2/examples/location/mapviewer/Main.qml new/qtlocation-everywhere-src-6.6.3/examples/location/mapviewer/Main.qml --- old/qtlocation-everywhere-src-6.6.2/examples/location/mapviewer/Main.qml 2024-02-09 23:39:30.000000000 +0100 +++ new/qtlocation-everywhere-src-6.6.3/examples/location/mapviewer/Main.qml 2024-03-19 02:59:08.000000000 +0100 @@ -1,6 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +import QtCore import QtQuick import QtQuick.Controls import QtLocation @@ -221,7 +222,10 @@ stackView.pop(page) switch (state) { case "FollowMe": - mapview.followme = !mapview.followme + if (!mapview.followme && (permission.status !== Qt.Granted)) + permissionDialog.open(); + else + mapview.followme = !mapview.followme break case "MiniMap": toggleMiniMapState() @@ -457,4 +461,42 @@ } } } + + LocationPermission { + id: permission + accuracy: LocationPermission.Precise + availability: LocationPermission.WhenInUse + } + + Dialog { + id: permissionDialog + anchors.centerIn: parent + padding: 20 + standardButtons: (permission.status === Qt.Denied) ? Dialog.Close + : Dialog.Close | Dialog.Ok + closePolicy: Dialog.NoAutoClose + title: qsTr("Permission") + + Label { + id: permissionRequestText + text: (permission.status === Qt.Denied) + ? qsTr("Grant the location permission then open the app again.") + : qsTr("Location permission is needed.") + } + + onAccepted: { + if (permission.status !== Qt.Denied) + permission.request(); + } + + onStandardButtonsChanged: { + if (standardButtons & Dialog.Ok) + standardButton(Dialog.Ok).text = qsTr("Request Permission"); + } + + Component.onCompleted: { + if (permission.status !== Qt.Granted) + open(); + } + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.6.2/examples/location/places_map/CMakeLists.txt new/qtlocation-everywhere-src-6.6.3/examples/location/places_map/CMakeLists.txt --- old/qtlocation-everywhere-src-6.6.2/examples/location/places_map/CMakeLists.txt 2024-02-09 23:39:30.000000000 +0100 +++ new/qtlocation-everywhere-src-6.6.3/examples/location/places_map/CMakeLists.txt 2024-03-19 02:59:08.000000000 +0100 @@ -38,7 +38,9 @@ # Resources: set(places_map_resource_files "marker.png" - "places_map.qml" + "Main.qml" + "PermissionsScreen.qml" + "PlacesMap.qml" ) qt6_add_resources(places_map "places_map" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.6.2/examples/location/places_map/Main.qml new/qtlocation-everywhere-src-6.6.3/examples/location/places_map/Main.qml --- old/qtlocation-everywhere-src-6.6.2/examples/location/places_map/Main.qml 1970-01-01 01:00:00.000000000 +0100 +++ new/qtlocation-everywhere-src-6.6.3/examples/location/places_map/Main.qml 2024-03-19 02:59:08.000000000 +0100 @@ -0,0 +1,34 @@ +// Copyright (C) 2024 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +import QtCore +import QtQuick + +Item { + id: root + anchors.fill: parent + + LocationPermission { + id: permission + accuracy: LocationPermission.Precise + availability: LocationPermission.WhenInUse + } + + PermissionsScreen { + anchors.fill: parent + visible: permission.status !== Qt.PermissionStatus.Granted + requestDenied: permission.status === Qt.PermissionStatus.Denied + onRequestPermission: permission.request() + } + + Component { + id: applicationComponent + PlacesMap {} + } + + Loader { + anchors.fill: parent + active: permission.status === Qt.PermissionStatus.Granted + sourceComponent: applicationComponent + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.6.2/examples/location/places_map/PermissionsScreen.qml new/qtlocation-everywhere-src-6.6.3/examples/location/places_map/PermissionsScreen.qml --- old/qtlocation-everywhere-src-6.6.2/examples/location/places_map/PermissionsScreen.qml 1970-01-01 01:00:00.000000000 +0100 +++ new/qtlocation-everywhere-src-6.6.3/examples/location/places_map/PermissionsScreen.qml 2024-03-19 02:59:08.000000000 +0100 @@ -0,0 +1,48 @@ +// Copyright (C) 2024 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +import QtQuick + +Rectangle { + id: root + + property bool requestDenied: false + + signal requestPermission + + Text { + id: textItem + anchors.centerIn: parent + text: root.requestDenied + ? qsTr("The application cannot run because the Location permission\n" + + "was not granted.\n" + + "Please grant the permission and restart the application.") + : qsTr("The application requires the Location permission to get\n" + + "the position and satellite information.\n" + + "Please press the button to request the permission.") + } + // custom button without importing Quick.Controls + Rectangle { + anchors { + top: textItem.bottom + topMargin: 10 + horizontalCenter: parent.horizontalCenter + } + visible: !root.requestDenied + width: parent.width * 0.8 + height: buttonText.implicitHeight * 2 + border.width: 1 + + Text { + id: buttonText + anchors.fill: parent + text: qsTr("Request Permission") + horizontalAlignment: Qt.AlignHCenter + verticalAlignment: Qt.AlignVCenter + MouseArea { + anchors.fill: parent + onClicked: root.requestPermission() + } + } + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.6.2/examples/location/places_map/PlacesMap.qml new/qtlocation-everywhere-src-6.6.3/examples/location/places_map/PlacesMap.qml --- old/qtlocation-everywhere-src-6.6.2/examples/location/places_map/PlacesMap.qml 1970-01-01 01:00:00.000000000 +0100 +++ new/qtlocation-everywhere-src-6.6.3/examples/location/places_map/PlacesMap.qml 2024-03-19 02:59:08.000000000 +0100 @@ -0,0 +1,85 @@ +// Copyright (C) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +//! [Imports] +import QtQuick +import QtPositioning +import QtLocation +//! [Imports] + +Rectangle { + anchors.fill: parent + + //! [Initialize Plugin] + Plugin { + id: myPlugin + name: "osm" + //specify plugin parameters if necessary + //PluginParameter {...} + //PluginParameter {...} + //... + } + //! [Initialize Plugin] + + //! [Current Location] + PositionSource { + id: positionSource + property variant lastSearchPosition: QtPositioning.coordinate(59.93, 10.76) //Initialized/Fallback to Oslo + active: true + updateInterval: 120000 // 2 mins + onPositionChanged: { + var distance = lastSearchPosition.distanceTo(position.coordinate) + if (distance > 500) { + // 500m from last performed food search + lastSearchPosition = positionSource.position.coordinate + } + } + } + //! [Current Location] + + //! [PlaceSearchModel] + PlaceSearchModel { + id: searchModel + + plugin: myPlugin + + searchTerm: "food" + searchArea: QtPositioning.circle(positionSource.lastSearchPosition, 1000 /* 1 km radius */) + Component.onCompleted: update() + } + //! [PlaceSearchModel] + + //! [Places MapItemView] + MapView { + id: view + anchors.fill: parent + map.plugin: myPlugin; + map.center: positionSource.lastSearchPosition + map.zoomLevel: 13 + + MapItemView { + model: searchModel + parent: view.map + delegate: MapQuickItem { + coordinate: place.location.coordinate + + anchorPoint.x: image.width * 0.5 + anchorPoint.y: image.height + + sourceItem: Column { + Image { id: image; source: "marker.png" } + Text { text: title; font.bold: true } + } + } + } + } + //! [Places MapItemView] + + Connections { + target: searchModel + function onStatusChanged() { + if (searchModel.status == PlaceSearchModel.Error) + console.log(searchModel.errorString()); + } + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.6.2/examples/location/places_map/doc/src/places_map.qdoc new/qtlocation-everywhere-src-6.6.3/examples/location/places_map/doc/src/places_map.qdoc --- old/qtlocation-everywhere-src-6.6.2/examples/location/places_map/doc/src/places_map.qdoc 2024-02-09 23:39:30.000000000 +0100 +++ new/qtlocation-everywhere-src-6.6.3/examples/location/places_map/doc/src/places_map.qdoc 2024-03-19 02:59:08.000000000 +0100 @@ -21,7 +21,7 @@ To write the QML application that will show places on a map, we start by making the following import declarations. - \snippet places_map/places_map.qml Imports + \snippet places_map/PlacesMap.qml Imports Instantiate a \l Plugin instance. The \l Plugin is effectively the backend from where places are sourced from. Depending on the chosen plugin @@ -29,7 +29,7 @@ \l {Qt Location Open Street Map Plugin}{OSM plugin} is selected which does not have any mandatory parameters. - \snippet places_map/places_map.qml Initialize Plugin + \snippet places_map/PlacesMap.qml Initialize Plugin Next we instantiate a \l PlaceSearchModel which we can use to specify search parameters and perform a places search operation. For illustrative @@ -38,7 +38,7 @@ {PlaceSearchModel::update} {update()} would be invoked in response to a user action such as a button click. - \snippet places_map/places_map.qml PlaceSearchModel + \snippet places_map/PlacesMap.qml PlaceSearchModel The map is displayed by using the \l MapView type and inside we declare the \l MapItemView and supply the search model and a delegate. An inline delegate @@ -48,12 +48,12 @@ other search result types may not have a \e place \l {PlaceSearchModel Roles} {role}. - \snippet places_map/places_map.qml Places MapItemView + \snippet places_map/PlacesMap.qml Places MapItemView Finally, a \c PositionSource is used to reset the map to the curent location and find "food" places in the new area. The position information is updated every 2 minutes and if the new position is more than 500 meters away from the last food search area the place search is retriggered. - \snippet places_map/places_map.qml Current Location + \snippet places_map/PlacesMap.qml Current Location */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.6.2/examples/location/places_map/main.cpp new/qtlocation-everywhere-src-6.6.3/examples/location/places_map/main.cpp --- old/qtlocation-everywhere-src-6.6.2/examples/location/places_map/main.cpp 2024-02-09 23:39:30.000000000 +0100 +++ new/qtlocation-everywhere-src-6.6.3/examples/location/places_map/main.cpp 2024-03-19 02:59:08.000000000 +0100 @@ -8,7 +8,7 @@ { QGuiApplication app(argc,argv); QQuickView view; - view.setSource(QUrl(QStringLiteral("qrc:///places_map.qml"))); + view.setSource(QUrl(QStringLiteral("qrc:///Main.qml"))); view.setWidth(360); view.setHeight(640); view.show(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.6.2/examples/location/places_map/places_map.qml new/qtlocation-everywhere-src-6.6.3/examples/location/places_map/places_map.qml --- old/qtlocation-everywhere-src-6.6.2/examples/location/places_map/places_map.qml 2024-02-09 23:39:30.000000000 +0100 +++ new/qtlocation-everywhere-src-6.6.3/examples/location/places_map/places_map.qml 1970-01-01 01:00:00.000000000 +0100 @@ -1,85 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -//! [Imports] -import QtQuick -import QtPositioning -import QtLocation -//! [Imports] - -Rectangle { - anchors.fill: parent - - //! [Initialize Plugin] - Plugin { - id: myPlugin - name: "osm" - //specify plugin parameters if necessary - //PluginParameter {...} - //PluginParameter {...} - //... - } - //! [Initialize Plugin] - - //! [Current Location] - PositionSource { - id: positionSource - property variant lastSearchPosition: QtPositioning.coordinate(59.93, 10.76) //Initialized/Fallback to Oslo - active: true - updateInterval: 120000 // 2 mins - onPositionChanged: { - var distance = lastSearchPosition.distanceTo(position.coordinate) - if (distance > 500) { - // 500m from last performed food search - lastSearchPosition = positionSource.position.coordinate - } - } - } - //! [Current Location] - - //! [PlaceSearchModel] - PlaceSearchModel { - id: searchModel - - plugin: myPlugin - - searchTerm: "food" - searchArea: QtPositioning.circle(positionSource.lastSearchPosition, 1000 /* 1 km radius */) - Component.onCompleted: update() - } - //! [PlaceSearchModel] - - //! [Places MapItemView] - MapView { - id: view - anchors.fill: parent - map.plugin: myPlugin; - map.center: positionSource.lastSearchPosition - map.zoomLevel: 13 - - MapItemView { - model: searchModel - parent: view.map - delegate: MapQuickItem { - coordinate: place.location.coordinate - - anchorPoint.x: image.width * 0.5 - anchorPoint.y: image.height - - sourceItem: Column { - Image { id: image; source: "marker.png" } - Text { text: title; font.bold: true } - } - } - } - } - //! [Places MapItemView] - - Connections { - target: searchModel - function onStatusChanged() { - if (searchModel.status == PlaceSearchModel.Error) - console.log(searchModel.errorString()); - } - } -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.6.2/examples/location/places_map/places_map.qrc new/qtlocation-everywhere-src-6.6.3/examples/location/places_map/places_map.qrc --- old/qtlocation-everywhere-src-6.6.2/examples/location/places_map/places_map.qrc 2024-02-09 23:39:30.000000000 +0100 +++ new/qtlocation-everywhere-src-6.6.3/examples/location/places_map/places_map.qrc 2024-03-19 02:59:08.000000000 +0100 @@ -1,6 +1,8 @@ <RCC> <qresource prefix="/"> <file>marker.png</file> - <file>places_map.qml</file> + <file>Main.qml</file> + <file>PermissionsScreen.qml</file> + <file>PlacesMap.qml</file> </qresource> </RCC> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.6.2/src/location/doc/src/places.qdoc new/qtlocation-everywhere-src-6.6.3/src/location/doc/src/places.qdoc --- old/qtlocation-everywhere-src-6.6.2/src/location/doc/src/places.qdoc 2024-02-09 23:39:30.000000000 +0100 +++ new/qtlocation-everywhere-src-6.6.3/src/location/doc/src/places.qdoc 2024-03-19 02:59:08.000000000 +0100 @@ -128,7 +128,7 @@ \table \row \li - \snippet places_map/places_map.qml Places MapItemView + \snippet places_map/PlacesMap.qml Places MapItemView \li \inlineimage places_map.png \endtable
participants (1)
-
Source-Sync