diff options
Diffstat (limited to 'sources/pyside6/PySide6/QtLocation')
| -rw-r--r-- | sources/pyside6/PySide6/QtLocation/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/QtLocation/typesystem_location.xml | 52 |
2 files changed, 12 insertions, 51 deletions
diff --git a/sources/pyside6/PySide6/QtLocation/CMakeLists.txt b/sources/pyside6/PySide6/QtLocation/CMakeLists.txt index 5489afae9..db5777e04 100644 --- a/sources/pyside6/PySide6/QtLocation/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtLocation/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2023 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + project(QtLocation) set(QtLocation_OPTIONAL_SRC ) @@ -28,8 +31,6 @@ ${QtLocation_GEN_DIR}/qplacecategory_wrapper.cpp ${QtLocation_GEN_DIR}/qplacecontactdetail_wrapper.cpp ${QtLocation_GEN_DIR}/qplacecontent_wrapper.cpp ${QtLocation_GEN_DIR}/qplacecontentrequest_wrapper.cpp -${QtLocation_GEN_DIR}/qplaceeditorial_wrapper.cpp -${QtLocation_GEN_DIR}/qplaceimage_wrapper.cpp ${QtLocation_GEN_DIR}/qplacemanagerengine_wrapper.cpp ${QtLocation_GEN_DIR}/qplacematchreply_wrapper.cpp ${QtLocation_GEN_DIR}/qplacematchrequest_wrapper.cpp @@ -37,7 +38,6 @@ ${QtLocation_GEN_DIR}/qplaceproposedsearchresult_wrapper.cpp ${QtLocation_GEN_DIR}/qplaceratings_wrapper.cpp ${QtLocation_GEN_DIR}/qplacereply_wrapper.cpp ${QtLocation_GEN_DIR}/qplaceresult_wrapper.cpp -${QtLocation_GEN_DIR}/qplacereview_wrapper.cpp ${QtLocation_GEN_DIR}/qplacesearchreply_wrapper.cpp ${QtLocation_GEN_DIR}/qplacesearchrequest_wrapper.cpp ${QtLocation_GEN_DIR}/qplacesearchresult_wrapper.cpp @@ -47,11 +47,6 @@ ${QtLocation_GEN_DIR}/qplacesupplier_wrapper.cpp ${QtLocation_GEN_DIR}/qtlocation_module_wrapper.cpp ) -if (Qt${QT_MAJOR_VERSION}Location_VERSION VERSION_EQUAL 5.11.0 - OR Qt${QT_MAJOR_VERSION}Location_VERSION VERSION_GREATER 5.11.0) - list(APPEND QtLocation_SRC - ${QtLocation_GEN_DIR}/qgeoserviceproviderfactoryv2_wrapper.cpp) -endif() set(QtLocation_include_dirs ${QtLocation_SOURCE_DIR} ${QtLocation_BINARY_DIR} diff --git a/sources/pyside6/PySide6/QtLocation/typesystem_location.xml b/sources/pyside6/PySide6/QtLocation/typesystem_location.xml index e0ff17d0e..e35b7bd11 100644 --- a/sources/pyside6/PySide6/QtLocation/typesystem_location.xml +++ b/sources/pyside6/PySide6/QtLocation/typesystem_location.xml @@ -1,45 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Python. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2018 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 --> -<typesystem package="PySide6.QtLocation"> +<typesystem package="PySide6.QtLocation" + namespace-begin="QT_BEGIN_NAMESPACE" namespace-end="QT_END_NAMESPACE"> <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> <load-typesystem name="QtPositioning/typesystem_positioning.xml" generate="no"/> <object-type name="QGeoCodeReply"> @@ -83,16 +48,14 @@ <object-type name="QGeoRoutingManager"/> <object-type name="QGeoRoutingManagerEngine"/> <object-type name="QGeoServiceProviderFactory"/> - <object-type name="QGeoServiceProviderFactoryV2" since="5.11"/> <value-type name="QPlaceAttribute"/> <value-type name="QPlaceCategory"/> <value-type name="QPlaceContactDetail"/> <value-type name="QPlaceContent"> <enum-type name="Type"/> + <enum-type name="DataTag" since="6.5"/> </value-type> <value-type name="QPlaceContentRequest"/> - <object-type name="QPlaceEditorial"/> - <object-type name="QPlaceImage"/> <object-type name="QPlaceManagerEngine"/> <object-type name="QPlaceMatchReply"/> <value-type name="QPlaceMatchRequest"/> @@ -103,7 +66,6 @@ <enum-type name="Type"/> </object-type> <object-type name="QPlaceResult"/> - <object-type name="QPlaceReview"/> <object-type name="QPlaceSearchReply"/> <object-type name="QPlaceSearchRequest"> <enum-type name="RelevanceHint"/> @@ -113,4 +75,8 @@ </object-type> <object-type name="QPlaceSearchSuggestionReply"/> <value-type name="QPlaceSupplier"/> + + <!-- QtQml, QtNetwork are pulled in via QtLocationDepends. --> + <suppress-warning text="^Scoped enum 'Q(Ocsp)|(Dtls)|(Qml).*' does not have a type entry.*$"/> + </typesystem> |