aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2023-03-07 12:38:15 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2023-03-07 14:25:03 +0100
commit452eac0702688a74539d2e66be07d6f322aa11ab (patch)
tree9b347d13d909eff5eaa96b82a5698fd8a7418fe4
parent54a29e48361252373bb50be515f71f29dd6df57d (diff)
Revive QtLocation
It has been re-added to 6.5. Change-Id: I2a8b7889d1179c173a9c8d81b04e0a224c9cf0a7 Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
-rw-r--r--sources/pyside6/PySide6/QtLocation/CMakeLists.txt4
-rw-r--r--sources/pyside6/PySide6/QtLocation/typesystem_location.xml5
-rw-r--r--sources/pyside6/cmake/PySideHelpers.cmake1
3 files changed, 2 insertions, 8 deletions
diff --git a/sources/pyside6/PySide6/QtLocation/CMakeLists.txt b/sources/pyside6/PySide6/QtLocation/CMakeLists.txt
index 1aea420ea..db5777e04 100644
--- a/sources/pyside6/PySide6/QtLocation/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtLocation/CMakeLists.txt
@@ -13,7 +13,6 @@ ${QtLocation_GEN_DIR}/qgeoroute_wrapper.cpp
${QtLocation_GEN_DIR}/qgeoroutereply_wrapper.cpp
${QtLocation_GEN_DIR}/qgeoroutesegment_wrapper.cpp
${QtLocation_GEN_DIR}/qgeoserviceprovider_wrapper.cpp
-${QtLocation_GEN_DIR}/qgeoserviceproviderfactoryv2_wrapper.cpp
${QtLocation_GEN_DIR}/qplace_wrapper.cpp
${QtLocation_GEN_DIR}/qplacecontentreply_wrapper.cpp
${QtLocation_GEN_DIR}/qplacedetailsreply_wrapper.cpp
@@ -32,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
@@ -41,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
diff --git a/sources/pyside6/PySide6/QtLocation/typesystem_location.xml b/sources/pyside6/PySide6/QtLocation/typesystem_location.xml
index ea8b661af..51c4b697e 100644
--- a/sources/pyside6/PySide6/QtLocation/typesystem_location.xml
+++ b/sources/pyside6/PySide6/QtLocation/typesystem_location.xml
@@ -47,16 +47,14 @@
<object-type name="QGeoRoutingManager"/>
<object-type name="QGeoRoutingManagerEngine"/>
<object-type name="QGeoServiceProviderFactory"/>
- <object-type name="QGeoServiceProviderFactoryV2"/>
<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"/>
@@ -67,7 +65,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"/>
diff --git a/sources/pyside6/cmake/PySideHelpers.cmake b/sources/pyside6/cmake/PySideHelpers.cmake
index 6658ed791..ad13d2afc 100644
--- a/sources/pyside6/cmake/PySideHelpers.cmake
+++ b/sources/pyside6/cmake/PySideHelpers.cmake
@@ -95,6 +95,7 @@ macro(collect_optional_modules)
Pdf
PdfWidgets
Positioning
+ Location
NetworkAuth
Nfc
Qml