Minor generation fixes for Qt 6.10

Author: usiems

generator/typesystem_core.xml

@@ -2181,7 +2181,25 @@ public:
   <object-type name="QJsonArray"/>
   <object-type name="QJsonDocument"/>
   <object-type name="QJsonObject"/>
-  <object-type name="QJsonParseError"/>
+  <object-type name="QJsonParseError">
+    <!-- generator can't handle std::conditional_t introduced with Qt 6.10 -->
+    <inject-code class="pywrap-h" since-version="6.10" before-version="7">
+      void py_set_offset(QJsonParseError* theWrappedObject, int offset){
+        theWrappedObject->offset = offset;
+      }
+      int py_get_offset(QJsonParseError* theWrappedObject){
+        return theWrappedObject->offset;
+      }
+    </inject-code>
+    <inject-code class="pywrap-h" since-version="7">
+      void py_set_offset(QJsonParseError* theWrappedObject, qint64 offset){
+        theWrappedObject->offset = offset;
+      }
+      qint64 py_get_offset(QJsonParseError* theWrappedObject){
+        return theWrappedObject->offset;
+      }
+    </inject-code>
+  </object-type>
   <object-type name="QJsonValue">
     <!-- workaround to handle using declaration for an enum in another class -->
     <!-- (currently not handled by the generator, handling needs to be added if this happens more often) -->

generator/typesystem_multimedia.xml

@@ -87,7 +87,15 @@
 <enum-type name="QMediaServiceProviderHint::Type"/>
 <enum-type name="QMediaStreamsControl::StreamType"/>
 
-<namespace-type name="QAudio"/>
+<namespace-type name="QAudio">
+  <!-- QAudio::convertVolume will be in QtAudio with Qt 7  -->
+  <inject-code class="pywrap-h" since-version="6.10">
+   float static_QAudio_convertVolume(float  volume, QAudio::VolumeScale  from, QAudio::VolumeScale  to)
+   {
+     return (QtAudio::convertVolume(volume, from, to));
+   }
+  </inject-code>
+</namespace-type>
 <namespace-type name="QMultimedia" since-version="5"/>
 
 <object-type name="QAbstractVideoBuffer" before-version="6"/>
@@ -226,6 +234,7 @@
   <object-type name="QAudioBufferOutput" since-version="6.8"/>
   <object-type name="QVideoFrameInput" since-version="6.8"/>
   <object-type name="QVideoFrameInput" since-version="6.8"/>
+  <object-type name="QPlaybackOptions" since-version="6.10"/>
 </group>
 
 </typesystem>