diff options
Diffstat (limited to 'sources/pyside6/PySide6/QtPositioning')
| -rw-r--r-- | sources/pyside6/PySide6/QtPositioning/CMakeLists.txt | 22 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/QtPositioning/typesystem_positioning.xml | 51 |
2 files changed, 27 insertions, 46 deletions
diff --git a/sources/pyside6/PySide6/QtPositioning/CMakeLists.txt b/sources/pyside6/PySide6/QtPositioning/CMakeLists.txt index 6a2942967..cad6dcb74 100644 --- a/sources/pyside6/PySide6/QtPositioning/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtPositioning/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2023 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + project(QtPositioning) set(QtPositioning_OPTIONAL_SRC ) @@ -11,6 +14,7 @@ ${QtPositioning_GEN_DIR}/qgeolocation_wrapper.cpp ${QtPositioning_GEN_DIR}/qgeocircle_wrapper.cpp ${QtPositioning_GEN_DIR}/qgeocoordinate_wrapper.cpp ${QtPositioning_GEN_DIR}/qgeopath_wrapper.cpp +${QtPositioning_GEN_DIR}/qgeopolygon_wrapper.cpp ${QtPositioning_GEN_DIR}/qgeopositioninfo_wrapper.cpp ${QtPositioning_GEN_DIR}/qgeopositioninfosource_wrapper.cpp ${QtPositioning_GEN_DIR}/qgeopositioninfosourcefactory_wrapper.cpp @@ -19,16 +23,11 @@ ${QtPositioning_GEN_DIR}/qgeosatelliteinfo_wrapper.cpp ${QtPositioning_GEN_DIR}/qgeosatelliteinfosource_wrapper.cpp ${QtPositioning_GEN_DIR}/qgeoshape_wrapper.cpp ${QtPositioning_GEN_DIR}/qnmeapositioninfosource_wrapper.cpp +${QtPositioning_GEN_DIR}/qnmeasatelliteinfosource_wrapper.cpp # module is always needed ${QtPositioning_GEN_DIR}/qtpositioning_module_wrapper.cpp ) -if (Qt${QT_MAJOR_VERSION}Positioning_VERSION VERSION_EQUAL 5.10.0 - OR Qt${QT_MAJOR_VERSION}Positioning_VERSION VERSION_GREATER 5.10.0) - list(APPEND QtPositioning_SRC - ${QtPositioning_GEN_DIR}/qgeopolygon_wrapper.cpp) -endif() - set(QtPositioning_include_dirs ${QtPositioning_SOURCE_DIR} ${QtPositioning_BINARY_DIR} ${Qt${QT_MAJOR_VERSION}Core_INCLUDE_DIRS} @@ -48,3 +47,14 @@ create_pyside_module(NAME QtPositioning TYPESYSTEM_PATH QtPositioning_SOURCE_DIR SOURCES QtPositioning_SRC DROPPED_ENTRIES QtPositioning_DROPPED_ENTRIES) + +if (APPLE) + # The QtLocation permission plugin cannot be linked to QtCore.abi3.so because for a framework + # build of Qt, the QtCore framework bundle must be loaded before calling + # Q_IMPORT_PLUGIN(QDarwinLocationPermissionPlugin) + set(permission_plugin_name "QDarwinLocationPermissionPlugin") + set(permission_plugin "${QT_CMAKE_EXPORT_NAMESPACE}::${permission_plugin_name}") + set_target_properties(QtPositioning PROPERTIES "_qt_has_${permission_plugin_name}_usage_description" TRUE) + # importing the plugin + qt6_import_plugins(QtPositioning INCLUDE ${permission_plugin}) +endif() diff --git a/sources/pyside6/PySide6/QtPositioning/typesystem_positioning.xml b/sources/pyside6/PySide6/QtPositioning/typesystem_positioning.xml index 145561d1f..8dac3f00d 100644 --- a/sources/pyside6/PySide6/QtPositioning/typesystem_positioning.xml +++ b/sources/pyside6/PySide6/QtPositioning/typesystem_positioning.xml @@ -1,46 +1,13 @@ <?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.QtPositioning"> +<typesystem package="PySide6.QtPositioning" + namespace-begin="QT_BEGIN_NAMESPACE" namespace-end="QT_END_NAMESPACE"> <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> + <inject-code class="native" position="beginning" file="../glue/qtpositioning.cpp" + snippet="darwin_location_permission_plugin"/> <value-type name="QGeoAddress"/> <value-type name="QGeoAreaMonitorInfo"/> <object-type name="QGeoAreaMonitorSource"> @@ -54,7 +21,7 @@ <enum-type name="CoordinateFormat"/> </value-type> <value-type name="QGeoPath"/> - <value-type name="QGeoPolygon" since="5.10"/> + <value-type name="QGeoPolygon"/> <value-type name="QGeoPositionInfo"> <enum-type name="Attribute"/> </value-type> @@ -77,4 +44,8 @@ <object-type name="QNmeaPositionInfoSource"> <enum-type name="UpdateMode"/> </object-type> + <object-type name="QNmeaSatelliteInfoSource"> + <enum-type name="UpdateMode"/> + <enum-type name="SatelliteInfoParseStatus"/> + </object-type> </typesystem> |