diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-03-27 11:43:25 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-03-27 23:06:32 +0200 |
| commit | ed68eec67393338d1019ad9babb03aa7d3e1bc1c (patch) | |
| tree | 1a5e288d6603f47d3cd8a65cb86860e9e25ee870 | |
| parent | 58272e8c8f20871f991c1f9604c4f1bd8fadaa07 (diff) | |
Add basic permission API
Pick-to: 6.5
Change-Id: Ic3b1df1afaf96af8118fda7efa4e7b76fc201e73
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
| -rw-r--r-- | sources/pyside6/PySide6/QtCore/CMakeLists.txt | 22 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/QtCore/typesystem_core_common.xml | 22 |
2 files changed, 44 insertions, 0 deletions
diff --git a/sources/pyside6/PySide6/QtCore/CMakeLists.txt b/sources/pyside6/PySide6/QtCore/CMakeLists.txt index 7d724d687..1407090ca 100644 --- a/sources/pyside6/PySide6/QtCore/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtCore/CMakeLists.txt @@ -3,6 +3,8 @@ project(QtCore) +set(QtCore_DROPPED_ENTRIES ) + set(QtCore_static_sources "${QtCore_SOURCE_DIR}/glue/qeasingcurve_glue.cpp" "${QtCore_SOURCE_DIR}/glue/core_snippets.cpp" @@ -197,6 +199,25 @@ ${SPECIFIC_OS_FILES} ${QtCore_GEN_DIR}/qtcore_module_wrapper.cpp ) +get_property(QtCore_disabled_features TARGET Qt${QT_MAJOR_VERSION}::Core + PROPERTY QT_DISABLED_PUBLIC_FEATURES) + +if("permissions" IN_LIST QtCore_disabled_features) + list(APPEND QtCore_DROPPED_ENTRIES QPermission + QBluetoothPermission QCalendarPermission QCameraPermission + QContactsPermission QLocationPermission QMicrophonePermission) + message(STATUS "Qt${QT_MAJOR_VERSION}Core: Dropping Permissions classes") +else() + list(APPEND QtCore_SRC + ${QtCore_GEN_DIR}/qbluetoothpermission_wrapper.cpp + ${QtCore_GEN_DIR}/qcalendarpermission_wrapper.cpp + ${QtCore_GEN_DIR}/qcamerapermission_wrapper.cpp + ${QtCore_GEN_DIR}/qcontactspermission_wrapper.cpp + ${QtCore_GEN_DIR}/qlocationpermission_wrapper.cpp + ${QtCore_GEN_DIR}/qmicrophonepermission_wrapper.cpp + ${QtCore_GEN_DIR}/qpermission_wrapper.cpp) +endif() + configure_file("${QtCore_SOURCE_DIR}/QtCore_global.post.h.in" "${QtCore_BINARY_DIR}/QtCore_global.post.h" @ONLY) @@ -223,6 +244,7 @@ create_pyside_module(NAME QtCore STATIC_SOURCES QtCore_static_sources TYPESYSTEM_NAME ${QtCore_BINARY_DIR}/typesystem_core.xml GLUE_SOURCES QtCore_glue_sources + DROPPED_ENTRIES QtCore_DROPPED_ENTRIES ) install(FILES ${pyside6_SOURCE_DIR}/qtcorehelper.h DESTINATION include/PySide6/QtCore/) diff --git a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml index c8e46c286..36e093532 100644 --- a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml +++ b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml @@ -930,6 +930,28 @@ </add-function> </value-type> + <value-type name="QPermission" since="6.5"> + <configuration condition="QT_CONFIG(permissions)"/> + </value-type> + <value-type name="QBluetoothPermission" since="6.5"> + <configuration condition="QT_CONFIG(permissions)"/> + </value-type> + <value-type name="QCalendarPermission" since="6.5"> + <configuration condition="QT_CONFIG(permissions)"/> + </value-type> + <value-type name="QCameraPermission" since="6.5"> + <configuration condition="QT_CONFIG(permissions)"/> + </value-type> + <value-type name="QContactsPermission" since="6.5"> + <configuration condition="QT_CONFIG(permissions)"/> + </value-type> + <value-type name="QLocationPermission" since="6.5"> + <configuration condition="QT_CONFIG(permissions)"/> + </value-type> + <value-type name="QMicrophonePermission" since="6.5"> + <configuration condition="QT_CONFIG(permissions)"/> + </value-type> + <value-type name="QPoint" hash-function="PySide::hash"> <extra-includes> <include file-name="pysideqhash.h" location="global"/> |