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-12-05 17:06:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-location (Old) and /work/SRC/openSUSE:Factory/.qt6-location.new.28523 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-location" Thu Dec 5 17:06:12 2024 rev:16 rq:1228192 version:6.8.1 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-location/qt6-location.changes 2024-10-17 18:39:32.210764841 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-location.new.28523/qt6-location.changes 2024-12-05 17:07:41.543210340 +0100 @@ -1,0 +2,6 @@ +Mon Dec 2 13:02:06 UTC 2024 - Christophe Marin <christo...@krop.fr> + +- Update to 6.8.1: + * https://www.qt.io/blog/qt-6.8.1-released + +------------------------------------------------------------------- Old: ---- qtlocation-everywhere-src-6.8.0.tar.xz New: ---- qtlocation-everywhere-src-6.8.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-location.spec ++++++ --- /var/tmp/diff_new_pack.6Mve1D/_old 2024-12-05 17:07:42.095233457 +0100 +++ /var/tmp/diff_new_pack.6Mve1D/_new 2024-12-05 17:07:42.095233457 +0100 @@ -16,7 +16,7 @@ # -%define real_version 6.8.0 +%define real_version 6.8.1 %define short_version 6.8 %define tar_name qtlocation-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-location%{?pkg_suffix} -Version: 6.8.0 +Version: 6.8.1 Release: 0 Summary: Qt 6 Location plugins and libraries License: GPL-3.0-or-later @@ -95,7 +95,8 @@ %autosetup -p1 -n %{tar_name}-%{real_version}%{tar_suffix} %build -%cmake_qt6 +%cmake_qt6 \ + -DQT_GENERATE_SBOM:BOOL=FALSE %{qt6_build} ++++++ qtlocation-everywhere-src-6.8.0.tar.xz -> qtlocation-everywhere-src-6.8.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.8.0/.cmake.conf new/qtlocation-everywhere-src-6.8.1/.cmake.conf --- old/qtlocation-everywhere-src-6.8.0/.cmake.conf 2024-10-02 17:15:09.000000000 +0200 +++ new/qtlocation-everywhere-src-6.8.1/.cmake.conf 2024-11-21 05:05:15.000000000 +0100 @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.8.0") +set(QT_REPO_MODULE_VERSION "6.8.1") 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.8.0/.tag new/qtlocation-everywhere-src-6.8.1/.tag --- old/qtlocation-everywhere-src-6.8.0/.tag 2024-10-02 17:15:09.000000000 +0200 +++ new/qtlocation-everywhere-src-6.8.1/.tag 2024-11-21 05:05:15.000000000 +0100 @@ -1 +1 @@ -5b57823810f8ba11ca9d1747cc7c38cacdd281c2 +6883067b142b243184f27c161a499a6d39c2b328 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.8.0/LICENSES/Apache-2.0.txt new/qtlocation-everywhere-src-6.8.1/LICENSES/Apache-2.0.txt --- old/qtlocation-everywhere-src-6.8.0/LICENSES/Apache-2.0.txt 2024-10-02 17:15:09.000000000 +0200 +++ new/qtlocation-everywhere-src-6.8.1/LICENSES/Apache-2.0.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,61 +0,0 @@ -Apache License -Version 2.0, January 2004 -http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. - - "Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. - 2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. - 3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. - 4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: - (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and - (b) You must cause any modified files to carry prominent notices stating that You changed the files; and - (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and - (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. - - You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. - 5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. - 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. - 7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. - 8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. - 9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - -To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. - -Copyright [yyyy] [name of copyright owner] - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.8.0/LICENSES/BSL-1.0.txt new/qtlocation-everywhere-src-6.8.1/LICENSES/BSL-1.0.txt --- old/qtlocation-everywhere-src-6.8.0/LICENSES/BSL-1.0.txt 2024-10-02 17:15:09.000000000 +0200 +++ new/qtlocation-everywhere-src-6.8.1/LICENSES/BSL-1.0.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ - - -Boost Software License - Version 1.0 - August 17th, 2003 - -Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by this license (the "Software") to use, reproduce, display, distribute, execute, and transmit the Software, and to prepare derivative works of the Software, and to permit third-parties to whom the Software is furnished to do so, all subject to the following: - -The copyright notices in the Software and this entire statement, including the above license grant, this restriction and the following disclaimer, must be included in all copies of the Software, in whole or in part, and all derivative works of the Software, unless such copies or derivative works are solely in the form of machine-executable object code generated by a source language processor. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.8.0/LICENSES/CC0-1.0.txt new/qtlocation-everywhere-src-6.8.1/LICENSES/CC0-1.0.txt --- old/qtlocation-everywhere-src-6.8.0/LICENSES/CC0-1.0.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/qtlocation-everywhere-src-6.8.1/LICENSES/CC0-1.0.txt 2024-11-21 05:05:15.000000000 +0100 @@ -0,0 +1,121 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.8.0/LICENSES/Qt-GPL-exception-1.0.txt new/qtlocation-everywhere-src-6.8.1/LICENSES/Qt-GPL-exception-1.0.txt --- old/qtlocation-everywhere-src-6.8.0/LICENSES/Qt-GPL-exception-1.0.txt 2024-10-02 17:15:09.000000000 +0200 +++ new/qtlocation-everywhere-src-6.8.1/LICENSES/Qt-GPL-exception-1.0.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -The Qt Company GPL Exception 1.0 - -Exception 1: - -As a special exception you may create a larger work which contains the -output of this application and distribute that work under terms of your -choice, so long as the work is not otherwise derived from or based on -this application and so long as the work does not in itself generate -output that contains the output from this application in its original -or modified form. - -Exception 2: - -As a special exception, you have permission to combine this application -with Plugins licensed under the terms of your choice, to produce an -executable, and to copy and distribute the resulting executable under -the terms of your choice. However, the executable must be accompanied -by a prominent notice offering all users of the executable the entire -source code to this application, excluding the source code of the -independent modules, but including any changes you have made to this -application, under the terms of this license. - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.8.0/REUSE.toml new/qtlocation-everywhere-src-6.8.1/REUSE.toml --- old/qtlocation-everywhere-src-6.8.0/REUSE.toml 1970-01-01 01:00:00.000000000 +0100 +++ new/qtlocation-everywhere-src-6.8.1/REUSE.toml 2024-11-21 05:05:15.000000000 +0100 @@ -0,0 +1,68 @@ +version = 1 + +[[annotations]] +path = ["src/plugins/geoservices/**"] +precedence = "closest" +comment = "source and plugins" +SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." +SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only" + +[[annotations]] +path = ["tests/auto/declarativetestplugin/qmldir", + "tests/auto/nokia_services/routing/*.xml", + "tests/auto/declarative_location_core/utils.js", + "tests/auto/qgeoroutexmlparser/route1.xml", + "tests/auto/qgeoroutexmlparser/route2.xml"] +precedence = "closest" +SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." +SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GPL-3.0-only" + +[[annotations]] +path = ["**.qrc", "**CMakeLists.txt", ".cmake.conf", "**.yaml", "**.json", + "**.pri", "src/configure.cmake", "**BLACKLIST"] +precedence = "closest" +comment = "build system" +SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." +SPDX-License-Identifier = "BSD-3-Clause" + +[[annotations]] +path = [".tag", "**/.gitattributes", "**.gitignore"] +precedence = "closest" +comment = "version control system. Licensed as build system" +SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." +SPDX-License-Identifier = "BSD-3-Clause" + +[[annotations]] +path = ["**/doc/images/**", "examples/**", "**/doc/snippets/**"] +comment = "this must be after the build system table because example and snippets take precedence over build system" +precedence = "closest" +SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." +SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR BSD-3-Clause" + +[[annotations]] +path = ["**.qdocconf", "**.qdocinc"] +comment = "documentation" +precedence = "closest" +SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." +SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only" + +[[annotations]] +path = ["**.toml", "licenseRule.json"] +comment = "documentation" +precedence = "override" +SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." +SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only" + +[[annotations]] +path = ["**/qt_attribution.json"] +comment = "currently not needed, but ready if such file is added. Documentation" +precedence = "override" +SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." +SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only" + +[[annotations]] +path = ["**LICENSE*"] +precedence = "override" +comment = "License file." +SPDX-FileCopyrightText = "None" +SPDX-License-Identifier = "CC0-1.0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.8.0/dependencies.yaml new/qtlocation-everywhere-src-6.8.1/dependencies.yaml --- old/qtlocation-everywhere-src-6.8.0/dependencies.yaml 2024-10-02 17:15:09.000000000 +0200 +++ new/qtlocation-everywhere-src-6.8.1/dependencies.yaml 2024-11-21 05:05:15.000000000 +0100 @@ -1,10 +1,10 @@ dependencies: ../qtbase: - ref: b839e9b36db3a4e50dfb34521d8ef8de1fd01969 + ref: 0db4321f2f13c6870283f3fcc0f1a462fd7cf663 required: true ../qtdeclarative: - ref: 2884c601242f030307a5acdca984b3aa0d34e064 + ref: b34fca34941ecdbf99819bbf58b45332ac9e6fa7 required: true ../qtpositioning: - ref: 0a6e079b80de16c4cd329c031741c8edd6b8f49e + ref: 9a8565dc6c94e7d7a977c0c2e8d3efd49879eca0 required: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.8.0/dist/REUSE.toml new/qtlocation-everywhere-src-6.8.1/dist/REUSE.toml --- old/qtlocation-everywhere-src-6.8.0/dist/REUSE.toml 1970-01-01 01:00:00.000000000 +0100 +++ new/qtlocation-everywhere-src-6.8.1/dist/REUSE.toml 2024-11-21 05:05:15.000000000 +0100 @@ -0,0 +1,8 @@ +version = 1 + +[[annotations]] +path = ["*"] +precedence = "override" +comment = "Licensed as documentation." +SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." +SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.8.0/src/location/declarativemaps/qdeclarativegeojsondata.cpp new/qtlocation-everywhere-src-6.8.1/src/location/declarativemaps/qdeclarativegeojsondata.cpp --- old/qtlocation-everywhere-src-6.8.0/src/location/declarativemaps/qdeclarativegeojsondata.cpp 2024-10-02 17:15:09.000000000 +0200 +++ new/qtlocation-everywhere-src-6.8.1/src/location/declarativemaps/qdeclarativegeojsondata.cpp 2024-11-21 05:05:15.000000000 +0100 @@ -91,18 +91,438 @@ \brief A model to represent, load and save GeoJSON documents. - The GeoJsonData element reads and writes GeoJson documents - (see the \l {https://en.wikipedia.org/wiki/GeoJSON} - {Wikipedia page}, \l {https://tools.ietf.org/html/rfc7946} {RFC}) from - the \l {sourceUrl}. - The respective data can be accessed as \l {QVariant} via the \l {model} property. - The \l {QVariant} representation can be used with delegates to visualize - the data or to make small modifications, e.g. adding new items with the - \l {addItem} function. + The GeoJsonData type reads and writes GeoJson formatted documents. + GeoJsonData has functions to open and save the model at the URL set + to the \l sourceUrl property. The loaded model is internally represented by + QVariant and binds to the \l model property. Use + \l{Models and Views in Qt Quick#View Delegates}{Delegates} to visualize the items + in a view. + + For information about GeoJSON, visit the \l{https://geojson.org/}{GeoJSON} website. + + \section1 GeoJSON Object + + The GeoJSON object is a valid JSON object that represents geometry, a feature, or a + collection of geometries or features. + + A GeoJSON object must be one of these types: + \list + \li \c Point + \li \c MultiPoint + \li \c LineString + \li \c MultiLineString + \li \c Polygon + \li \c MultiPolygon + \li \c GeometryCollection + \li \c Feature + \li \c FeatureCollection + \endlist + + To set the type, bind the \c type member to a GeoJSON type. The \c coordinates member can + be a type of QGeoShape or a list, depending on the GeoJSON type. The \c Feature type has an additional + \c geometry and \c properties member. + + A list of the geometric types and their equivalent QVariant representations: + + \list + \li For a \c Point object, \c coordinates pairs with QGeoCircle. + For example: + \code + { + "type": "Point", + "coordinates": [11, 60] + } + \endcode + This GeoJSON object has a corresponding QVariantMap representation: + \code + { + type: "Point" + coordinates: QGeoCircle({11.000, 60.000}, -1) + } + \endcode + + \li For a \c LineString object, \c coordinates pairs with QGeoPath. + For example: + \code + { + "type" : "LineString", + "coordinates" : [ + [13.5, 43], + [10.73, 59.92] + ] + } + \endcode + This GeoJSON object has a corresponding QVariantMap representation: + \code + { + type : "LineString" + data : QGeoPath([{43.000, 13.500}, {59.920, 10.730}]) + } + \endcode + + \li For a \c{Polygon} object, \c coordinates member pairs with QGeoPolygon (holes are possible). The polygon is a + \e{linear ring}, whose final coordinate is the same as the first coordinate, thereby opening and closing + the ring. The \c bbox member is an optional member and is for setting the area's range, useful for concave boundaries. + For more information about the accepted polygon coordinates, read about the + \l{https://datatracker.ietf.org/doc/html/rfc7946#section-3.1.6Polygon}{Polygon} type in the GeoJson specification. + For example: + \code + { + "type": "Polygon", + "coordinates": [ + [ + [17.13, 51.11], + [30.54, 50.42], + [26.70, 58.36], + [17.13, 51.11] + ] + ], + "bbox": [50, -50, 10, -10] + } + \endcode + This GeoJSON object has a corresponding QVariantMap representation: + \code + { + type : "Polygon" + coordinates : QGeoPolygon([{51.110, 17.130}, {50.420,30.540}, {58.360, 26.700}, {51.110, 17.130}]) + } + \endcode + + \endlist + + For the \c MultiPoint, \c MultiLineString, and \c MultiPolygon types, \c coordinates pairs with a QVariantList. + The list element is a QVariantMap containing geometry. + + \list + \li For a \c MultiPoint object, \c coordinates pairs with a list of Point coordinates. + For example: + \code + { + "type": "MultiPoint", + "coordinates": [ + [11, 60], + [5.5, 60.3], + [5.7, 58.90] + ] + } + \endcode + This GeoJSON object has a corresponding QVariantMap representation: + \code + { + type : "MultiPoint" + coordinates : [ + { + type : "Point" + coordinates : QGeoCircle({60.000, 11.000}, -1) + }, + { + type : "Point" + coordinates : QGeoCircle({60.300, 5.500}, -1) + }, + { + type : "Point" + coordinates : QGeoCircle({58.900, 5.700}, -1) + } + ] + } + \endcode + + \li For a \c MultiLineString object, \c coordinates pairs with a list of LineString coordinates. + The following GeoJSON object constructs two non-parallel lines: + \code + { + "type" : "MultiLineString", + "coordinates" : [ + [[13.5, 43], [10.73, 59.92]], + [[9.15, 45], [-3.15, 58.90]] + ] + } + \endcode + This GeoJSON object has a corresponding QVariantMap representation: + \code + { + type : "MultiLineString" + coordinates : [ + { + type : "LineString" + coordinates : QGeoPath([{45.000, 9.150}, {58.900, -3.150}]) + }, + { + type : "LineString" + coordinates : QGeoPath([{43.000, 13.500}, {59.920, 10.730}]) + } + ] + } + \endcode + + \li For a \c MultiPolygon type, \c coordinates pairs with a list of Polygon coordinates. + The polygon is a \e{linear ring} and the \c Polygon type has more information about accepted formats. + The following GeoJSON object contains a list of two triangles: + \code + { + "type" : "MultiPolygon", + "coordinates" : [ + [ + [[17.13, 51.11], + [30.54, 50.42], + [26.74, 58.36], + [17.13, 51.11] + ]], + [ + [[19.84, 41.33], + [30.45, 49.26], + [17.07, 50.10], + [19.84, 41.33] + ]] + ] + } + \endcode + This GeoJSON object has a corresponding QVariantMap representation: + \code + { + type : "MultiPolygon" + coordinates : [ + { + type : "Polygon" + coordinates : QGeoPolygon([{51.110, 17.130}, {50.420,30.540}, {58.360, 26.740}]) + }, + { + type : "Polygon" + coordinates : QGeoPolygon([{41.330, 19.840}, {49.260,30.450}, {50.100, 17.070}]) + } + ] + } + \endcode + + \endlist + + The \c GeometryCollection type is a composition of other geometry types. The value of the + \c geometries member is a QVariantList containing QVariantMaps of various types, + including other GeometryCollection types. + + For example, the following \c GeometryCollection type contains several other geometries: + \code + { + "type" : "GeometryCollection", + "geometries" : [ + { + "type" : "MultiPoint", + "coordinates" : [ + [11,60], [5.5,60.3], [5.7,58.90] + ] + }, + { + "type" : "MultiLineString", + "coordinates": [ + [[13.5, 43], [10.73, 59.92]], + [[9.15, 45], [-3.15, 58.90]] + ] + }, + { + "type" : "MultiPolygon", + "coordinates" : [ + [ + [ + [17.13, 51.11], + [30.54, 50.42], + [26.74, 58.36], + [17.13, 51.11] + ] + ], + [ + [ + [19.84, 41.33], + [30.45, 49.26], + [17.07, 50.10], + [19.84, 41.33] + ] + ] + ] + } + ] + } + \endcode + This GeoJSON object has a corresponding QVariantMap representation: + \code + { + type : "GeometryCollection" + coordinates : [ + { + type : "MultiPolygon" + coordinates : [ + { + type : "Polygon" + coordinates : QGeoPolygon([{41.330, 19.840}, {49.260, 30.450}, {50.100, 17.070}]) + }, + { + type : "Polygon" + coordinates : QGeoPolygon([{51.110, 17.130}, {50.420, 30.540}, {58.360, 26.740}]) + } + ] + } + { + type : "MultiLineString" + coordinates : [ + { + type : "LineString" + coordinates : QGeoPath([{45.000, 9.150}, {58.900, -3.150}]) + }, + { + type : "LineString" + coordinates : QGeoPath([{43.000, 13.500}, {59.920, 10.730}]) + } + ] + } + { + type : "MultiPoint" + coordinates : [ + { + type : Point + coordinates : QGeoCircle({58.900, 5.700}, -1) + }, + { + type : Point + coordinates : QGeoCircle({60.300, 5.500}, -1) + }, + { + type : Point + coordinates : QGeoCircle({60.000, 11.000}, -1) + } + ] + } + ] + } + \endcode + + The \c Feature type contains an additional \c geometry and \c properties + member. The only way to distinguish a Feature object from other geometrical objects + is to check for the existence of a \c properties node in the QVariantMap object. + + For example, the following \c Feature has a geometry and properties members: + \code + { + "type": "Feature", + "id": "Poly", + "properties": { + "name": "Poly", + "text": "This is a Feature with a Polygon", + "color": "limegreen" + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [17.13, 51.11], + [30.54, 50.42], + [26.70, 58.36], + [17.13, 51.11] + ], + [ + [23.46, 54.36], + [20.52, 51.91], + [28.25, 51.50], + [26.80, 54.36], + [23.46, 54.36] + ] + ] + } + } + \endcode + This GeoJSON object has a corresponding QVariantMap representation: + \code + { + type : "Polygon" + data : QGeoPolygon([{51.110, 17.130}, {50.420,30.540}, {58.360, 26.700}, {51.110, 17.130}]) + properties : {text : "This is a Feature with a Polygon"} + } + \endcode + + The \c FeatureCollection is a composition of Feature objects. THe \c features + member binds to a QVariantList object containing other Feature objects. + + For example, the following \c FeatureCollection has several Features and geometries: + \code + { + "type" : "FeatureCollection", + "properties" : { + "color" : "crimson" + }, + "features" : [ + { + "type" : "Feature", + "id" : "Poly", + "properties" : { + "text" : "This is a Feature with a Polygon" + }, + "geometry" : { + "type" : "Polygon", + "coordinates" : [ + [ + [17.13, 51.11], + [30.54, 50.42], + [26.70, 58.36], + [17.13, 51.11] + ], + [ + [23.46, 54.36], + [20.52, 51.91], + [28.25, 51.50], + [26.80, 54.36], + [23.46, 54.36] + ] + ] + } + }, + { + "type" : "Feature", + "id" : "MultiLine", + "properties" : { + "text" : "This is a Feature with a MultiLineString", + "color" : "deepskyblue" + }, + "geometry" : { + "type" : "MultiLineString", + "coordinates" : [ + [[13.5, 43], [10.73, 59.92]], + [[9.15, 45], [-3.15, 58.90]] + ] + } + } + ] + } + \endcode + This GeoJSON object has a corresponding QVariantMap representation: + \code + { + type: "FeatureCollection" + data: [{ + type: "MultiLineString" + data: [{ + type: "LineString" + data: QGeoPath( [{45.000, 9.150}, {58.900, -3.150}] ) + } { + type: "LineString" + data: QGeoPath( [{43.000, 13.500}, {59.920, 10.730}] ) + }] + properties: { text: "This is a Feature with a MultiLineString" } + }, + { + type: "Polygon" + data: QGeoPolygon( {51.110, 17.130}, + {50.420, 30.540}, + {58.360, 26.700}, + {51.110, 17.130} + ) + properties: { text: "This is a Feature with a Polygon" } + } + ] + } + \endcode - New data can be stored with the \l {save} and \l {saveAs} functions. + \section1 GeoJson Example - \sa QGeoJson + The \l{GeoJson Viewer (QML)}{GeoJson Viewer} example demonstrates the use of the GeoJsonData QML type to + load and visualize coordinates on a map. */ @@ -120,8 +540,8 @@ /*! \qmlproperty QVariant QtLocation::GeoJsonData::model - A \l QVariant representation of the GeoJSON document that - can be used to display the contents with delegates. + A QVariant representation of the GeoJSON document. QML + delegates can display the contents in views. \since 6.7 */ @@ -140,8 +560,8 @@ /*! \qmlproperty QUrl QtLocation::GeoJsonData::sourceUrl - The URL from which the GeoJSON document is read. Setting this - property will change the \l model to represent the respective document. + The URL of a GeoJSON document. Setting this property loads the + document and binds the object to the \l model member. \since 6.7 */ @@ -155,7 +575,7 @@ /*! \qmlmethod void QtLocation::GeoJsonData::clear() - Delete all items in the \l model of the GeoJsonData. + Deletes all items bound to the \l model. */ void QDeclarativeGeoJsonData::clear() { @@ -166,9 +586,9 @@ /*! \qmlmethod bool QtLocation::GeoJsonData::addItem(Item item) - Add the \a item to the \l model of the GeoJsonData. + Adds the \a item to the \l model object. - Returns \c true if the file was read successfully, \c false otherwise. + Returns \c true if adding is successful, \c false otherwise. */ void QDeclarativeGeoJsonData::addItem(QQuickItem *item) { @@ -200,9 +620,9 @@ /*! \qmlmethod bool QtLocation::GeoJsonData::open() - Reload the content of the file at \l sourceUrl. + Loads the content of the file at \l sourceUrl. - Returns \c true if the file was read successfully, \c false otherwise. + Returns \c true if opening is successful, \c false otherwise. */ bool QDeclarativeGeoJsonData::open() { @@ -212,10 +632,10 @@ /*! \qmlmethod bool QtLocation::GeoJsonData::openUrl(Url url) - Open the GeoJson file at \a url and load its content. The property - \l sourceUrl will be set to \a url if the file is read successfully. + Loads the GeoJson document at \a url and binds it to the \l model. The property + \l sourceUrl is set to \a url if opening the file is successful. - Returns \c true if the file was read successfully, \c false otherwise. + Returns \c true if opening is successful, \c false otherwise. */ bool QDeclarativeGeoJsonData::openUrl(const QUrl &url) { @@ -248,10 +668,10 @@ /*! \qmlmethod bool QtLocation::GeoJsonData::saveAs(Url url) - The current \l model of the GeoJsonData object is saved under \a url. - The \l sourceUrl property will be set to \a url. + Saves the \l model at \a url. + The \l sourceUrl property is set to \a url if successful. - Returns \c true if the file was saved successfully, \c false otherwise. + Returns \c true if saving is successful, \c false otherwise. */ bool QDeclarativeGeoJsonData::saveAs(const QUrl &url) { @@ -265,10 +685,9 @@ /*! \qmlmethod bool QtLocation::GeoJsonData::save() - The current \l model of the GeoJsonData object is saved under - \l sourceUrl. + Saves the model at \l{sourceUrl}. - Returns \c true if the file was saved successfully, \c false otherwise. + Returns \c true if saving is successful, \c false otherwise. */ bool QDeclarativeGeoJsonData::save() { @@ -278,11 +697,10 @@ /*! \qmlmethod void QtLocation::GeoJsonData::setModelToMapContents(MapView mapItemView) - All mapItems of \a mapItemView are added to the \l model of the GeoJsonData - object. - Previously stored mapItems are deleted from the \l model. + Adds all map items of \a mapItemView to the \l model of the GeoJsonData + object. Deletes previously stored map items from the \l model. - Returns \c true if mapItemView is set successfully, \c false otherwise. + Returns \c true if setting is successful, \c false otherwise. \sa addItem */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.8.0/src/location/maps/qgeojson.cpp new/qtlocation-everywhere-src-6.8.1/src/location/maps/qgeojson.cpp --- old/qtlocation-everywhere-src-6.8.0/src/location/maps/qgeojson.cpp 2024-10-02 17:15:09.000000000 +0200 +++ new/qtlocation-everywhere-src-6.8.1/src/location/maps/qgeojson.cpp 2024-11-21 05:05:15.000000000 +0100 @@ -16,479 +16,12 @@ QT_BEGIN_NAMESPACE -/*! \namespace QGeoJson +/*! + \namespace QGeoJson \inmodule QtLocation - \keyword QGeoJson Namespace + \internal - \brief The QGeoJson namespace contains functions to import and export - geolocated information from and to GeoJson files. - - \since 5.13 - - The methods in the QGeoJson namespace can be used to convert between a - GeoJSON document (see the \l {https://en.wikipedia.org/wiki/GeoJSON} - {Wikipedia page}, \l {https://tools.ietf.org/html/rfc7946} {RFC}) and a - \l QVariantList of \l QVariantMap elements ready to be used as Model in - a \l MapItemView. - - \section2 Importing GeoJSON - - The importGeoJson() method accepts a \l QJsonDocument from which it - extracts a single \l {https://tools.ietf.org/html/rfc7159} {JSON} object. - The GeoJSON RFC expects that a valid GeoJSON Document has in its root - a single JSON object. This method doesn't perform any validation on the - input. The importer returns a QVariantList containing a single QVariantMap. - This map has always at least 2 (key, value) pairs. The first one has \c - type as key, and the corresponding value is a string identifying the - GeoJSON type. This value can be one of the GeoJSON object types: \c Point, - \c MultiPoint, \c LineString, \c MultiLineString, \c Polygon, \c - MultiPolygon, \c GeometryCollection, \c FeatureCollection. The second pair - has \c data as key, and the corresponding value can be either a QGeoShape - or a list, depending on the GeoJSON type. The next section provides details - about the conversation form GeoJson objects to objects known in Qt Location. - The \c Feature type is converted into the type of the - geometry contained within, with an additional (key, value) pair, where the - key is \c properties and the value is a \l QVariantMap. Thus, a feature Map - is distinguishable from the corresponding geometry, by looking for a \c - properties member. - - \section3 Structure of the data node - - For the single type geometry objects (\c Point, \c LineString, and \c - Polygon), the value corresponding to the \c data key is a QGeoShape: - - \list - \li When the type is \c Point, the data is a QGeoCircle with the point - coordinates stored in the center property. - - For example, the following GeoJSON document contains a \c Point - geometry: - - \code - { - "type" : "Point", - "data" : [60.0, 11.0] - } - \endcode - - it is converted to a QVariantMap with the following structure: - - \code - { - type : "Point" - data : QGeoCircle({60.000, 11.000}, -1) - } - \endcode - - \li When the type is \c LineString the data is a QGeoPath. - - For example, the following GeoJSON document contains a \c LineString - geometry: - - \code - { - "type" : "LineString", - "coordinates" : [[13.5, 43],[10.73, 59.92]] - } - \endcode - - it is converted to a QVariantMap with the following structure: - - \code - { - type : "LineString", - data : QGeoPath([{43.000, 13.500}, {59.920, 10.730}]) - } - \endcode - - \li When the type is \c Polygon, the data is a QGeoPolygon (holes are - supported). - - For example, the following GeoJSON document contains a \c Polygon - geometry: - - \code - { - "type" : "Polygon", - "coordinates" : [ - [[17.13, 51.11], - [30.54, 50.42], - [26.70, 58.36], - [17.13, 51.11]] - ], - "bbox" : [60, 60, -60, -60] - - } - \endcode - - it is converted to a QVariantMap with the following structure: - - \code - { - type : "Polygon" - data : QGeoPolygon([{51.110, 17.130}, {50.420,30.540}, {58.360, 26.700}, {51.110, 17.130}]) - } - \endcode - - \endlist - - For the homogeneously typed multipart geometry objects (\c MultiPoint, \c - MultiLineString, \c MultiPolygon) the value corresponding to the \c data - key is a QVariantList. Each element of the list is a QVariantMap of one of - the above listed types. The elements in this list will be all of the same - GeoJSON type: - - \list - \li When the type is \c MultiPoint, the data is a List of Points. - - For example, the following GeoJSON document contains a \c MultiPoint - geometry: - - \code - { - "type" : "MultiPoint", - "coordinates" : [ - [11,60], - [5.5,60.3], - [5.7,58.90] - ] - } - \endcode - - it is converted to a QVariantMap with the following structure: - - \code - { - type : "MultiPoint" - data : [ - { - type : "Point" - data : QGeoCircle({60.000, 11.000}, -1) - }, - { - type : "Point" - data : QGeoCircle({60.300, 5.500}, -1) - }, - { - type : "Point" - data : QGeoCircle({58.900, 5.700}, -1) - } - ] - } - \endcode - - \li When the type is \c MultiLineString, the data is a List of LineStrings. - - For example, the following GeoJSON document contains a \c MultiLineString - geometry: - - \code - { - "type" : "MultiLineString", - "coordinates" : [ - [[13.5, 43], [10.73, 59.92]], - [[9.15, 45], [-3.15, 58.90]] - ] - } - \endcode - - it is converted to a QVariantMap with the following structure: - - \code - { - type : "MultiLineString" - data : [ - { - type : "LineString" - data : QGeoPath([{45.000, 9.150}, {58.900, -3.150}]) - }, - { - type : "LineString" - data : QGeoPath([{43.000, 13.500}, {59.920, 10.730}]) - } - ] - } - \endcode - - \li When the type is \c MultiPolygon, the data is a List of Polygons. - - For example, the following GeoJSON document contains a \c MultiPolygon - geometry: - - \code - { - "type" : "MultiPolygon", - "coordinates" : [ - [ - [ - [17.13, 51.11], - [30.54, 50.42], - [26.74, 58.36], - [17.13, 51.11] - ] - ], - [ - [ - [19.84, 41.33], - [30.45, 49.26], - [17.07, 50.10], - [19.84, 41.33] - ] - ] - ] - } - \endcode - - it is converted to a QVariantMap with the following structure: - - \code - { - type : "MultiPolygon" - data : [ - { - type : "Polygon" - data : QGeoPolygon([{51.110, 17.130}, {50.420,30.540}, {58.360, 26.700}, {51.110, 17.130}]) - }, - { - type : "Polygon" - data : QGeoPolygon([{41.330, 19.840}, {49.260,30.450}, {50.100, 17.070}, {41.330, 19.840}]) - } - ] - } - \endcode - - \endlist - - The \c GeometryCollection is a heterogeneous composition of other geometry - types. In the resulting QVariantMap, the value of the \c data member is a - QVariantList populated by QVariantMaps of various geometries, including the - GeometryCollection itself. - - For example, the following \c GeometryCollection: - - \code - { - "type" : "GeometryCollection", - "geometries" : [ - { - "type" : "MultiPoint", - "coordinates" : [ - [11,60], [5.5,60.3], [5.7,58.90] - ] - }, - { - "type" : "MultiLineString", - "coordinates" : [ - [[13.5, 43], [10.73, 59.92]], - [[9.15, 45], [-3.15, 58.90]] - ] - }, - { - "type" : "MultiPolygon", - "coordinates" : [ - [ - [[17.13, 51.11], - [30.54, 50.42], - [26.74, 58.36], - [17.13, 51.11]] - ], - [ - [[19.84, 41.33], - [30.45, 49.26], - [17.07, 50.10], - [19.84, 41.33]] - ] - ] - } - ] - } - \endcode - - it is converted to a QVariantMap with the following structure: - - \code - { - type : "GeometryCollection" - data : [ - { - type : "MultiPolygon" - data : [ - { - type : "Polygon" - data : QGeoPolygon([{41.330, 19.840}, {49.260, 30.450}, {50.100, 17.070}, {41.330, 19.840}]) - } - { - type : "Polygon" - data : QGeoPolygon([{51.110, 17.130}, {50.420, 30.540}, {58.360, 26.740}, {51.110, 17.130}]) - } - ] - } - { - type : "MultiLineString" - data : [ - { - type : "LineString" - data : QGeoPath([{45.000, 9.150}, {58.900, -3.150}]) - } - { - type : "LineString" - data : QGeoPath([{43.000, 13.500}, {59.920, 10.730}]) - } - ] - } - { - type : "MultiPoint" - data : [ - { - type : Point - data : QGeoCircle({58.900, 5.700}, -1) - }, - { - type : Point - data : QGeoCircle({60.300, 5.500}, -1) - }, - { - type : Point - data : QGeoCircle({60.000, 11.000}, -1) - } - ] - } - ] - } - \endcode - - The \c Feature object, which consists of one of the previous geometries - together with related attributes, is structured like one of the 7 above - mentioned geometry types, plus a \c properties member. The value of this - member is a QVariantMap. The only way to distinguish a Feature from the - included geometry is to check if a \c properties node is present in the - QVariantMap. - - For example, the following \c Feature: - - \code - { - "type" : "Feature", - "id" : "Poly", - "properties" : { - "text" : "This is a Feature with a Polygon" - }, - "geometry" : { - "type" : "Polygon", - "coordinates" : [ - [[17.13, 51.11], - [30.54, 50.42], - [26.70, 58.36], - [17.13, 51.11]], - [[23.46, 54.36], - [20.52, 51.91], - [28.25, 51.50], - [26.80, 54.36], - [23.46, 54.36]] - ] - } - } - \endcode - - it is converted to a QVariantMap with the following structure: - - \code - { - type : "Polygon" - data : QGeoPolygon([{51.110, 17.130}, {50.420,30.540}, {58.360, 26.700}, {51.110, 17.130}]) - properties : {text : "This is a Feature with a Polygon"} - } - \endcode - - The \c FeatureCollection is a composition of Feature objects. The value of - the \c data member in a FeatureCollection is a QVariantList populated by - Feature type QVariantMaps. - - For example, the following \c FeatureCollection: - - \code - { - "type" : "FeatureCollection", - "features" : [ - { - "type" : "Feature", - "id" : "Poly", - "properties" : { - "text" : "This is a Feature with a Polygon" - }, - "geometry" : { - "type" : "Polygon", - "coordinates" : [ - [[17.13, 51.11], - [30.54, 50.42], - [26.70, 58.36], - [17.13, 51.11]], - [[23.46, 54.36], - [20.52, 51.91], - [28.25, 51.50], - [26.80, 54.36], - [23.46, 54.36]] - ] - } - }, - { - "type" : "Feature", - "id" : "MultiLine", - "properties" : { - "text" : "This is a Feature with a MultiLineString" - }, - "geometry" : { - "type" : "MultiLineString", - "coordinates" : [ - [[13.5, 43], [10.73, 59.92]], - [[9.15, 45], [-3.15, 58.90]] - ] - } - } - ] - } - \endcode - - it is converted to a QVariantMap with the following structure: - - \code - { - type : "FeatureCollection" - data : [ - { - type : "MultiLineString" - data : [ - { - type : "LineString" - data : QGeoPath([{45.000, 9.150}, {58.900, -3.150}]) - } - { - type : "LineString" - data : QGeoPath([{43.000, 13.500}, {59.920, 10.730}]) - } - ] - properties : {text : "This is a Feature with a MultiLineString"} - }, - { - type : "Polygon" - data : QGeoPolygon({51.110, 17.130}, {50.420, 30.540}, {58.360, 26.700}, {51.110, 17.130}) - properties : {text : "This is a Feature with a Polygon"} - } - ] - } - \endcode - - \section2 Exporting GeoJSON - - The exporter accepts the QVariantList returned by the \l {Importing GeoJSON} - {importer}, and returns a JSON document. The exporter is complementary to - the importer because it executes the inverse action. - - \section2 The toString function - - The \l toString outputs, for debugging purposes, the content of a - QVariantList structured like \l importGeoJson does, to a QString using a - prettyfied format. + From Qt 6.7, QGeoJson is a private API. The replacement API is the GeoJsonData QML type. */ static QGeoCoordinate importPosition(const QVariant &position) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.8.0/tests/auto/declarative_ui/tst_map_keepgrab.qml new/qtlocation-everywhere-src-6.8.1/tests/auto/declarative_ui/tst_map_keepgrab.qml --- old/qtlocation-everywhere-src-6.8.0/tests/auto/declarative_ui/tst_map_keepgrab.qml 2024-10-02 17:15:09.000000000 +0200 +++ new/qtlocation-everywhere-src-6.8.1/tests/auto/declarative_ui/tst_map_keepgrab.qml 2024-11-21 05:05:15.000000000 +0100 @@ -83,7 +83,6 @@ pan() // pan map: this interrupts flicking compare(flickStartedSpy.count, 1) // didn't start flicking again compare(flickable.flicking, false) - tryCompare(flickEndedSpy, "count", 0) // canceled rather than ending normally tryCompare(panActiveSpy, "count", 2) // map should change verify(center != mapView.map.center) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.8.0/tests/baseline/mapitems/data/polygon/include/REUSE.toml new/qtlocation-everywhere-src-6.8.1/tests/baseline/mapitems/data/polygon/include/REUSE.toml --- old/qtlocation-everywhere-src-6.8.0/tests/baseline/mapitems/data/polygon/include/REUSE.toml 1970-01-01 01:00:00.000000000 +0100 +++ new/qtlocation-everywhere-src-6.8.1/tests/baseline/mapitems/data/polygon/include/REUSE.toml 2024-11-21 05:05:15.000000000 +0100 @@ -0,0 +1,8 @@ +version = 1 + +[[annotations]] +path = ["GeometryAntarctica.qml", + "GeometryAntarctica.qml"] +comment = "MIT license documented in file is not reuse readable." +precedence = "aggregate" +SPDX-License-Identifier = "MIT"
