diff options
Diffstat (limited to 'sources/pyside6/PySide6/QtPositioning')
| -rw-r--r-- | sources/pyside6/PySide6/QtPositioning/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/QtPositioning/typesystem_positioning.xml | 9 |
2 files changed, 23 insertions, 1 deletions
diff --git a/sources/pyside6/PySide6/QtPositioning/CMakeLists.txt b/sources/pyside6/PySide6/QtPositioning/CMakeLists.txt index 125c18ce5..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 ) @@ -20,6 +23,7 @@ ${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 ) @@ -43,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 359a7062d..8dac3f00d 100644 --- a/sources/pyside6/PySide6/QtPositioning/typesystem_positioning.xml +++ b/sources/pyside6/PySide6/QtPositioning/typesystem_positioning.xml @@ -3,8 +3,11 @@ // 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"> @@ -41,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> |