More missing type entries, and

rename after-version entries to since-version

Author: usiems

generator/typesystem_core.xml

@@ -694,9 +694,11 @@
   <enum-type name="QFile::FileHandleFlag" flags="QFile::FileHandleFlags"/>
   <enum-type name="QIODevice::OpenModeFlag" flags="QIODevice::OpenMode"/>
   <enum-type name="QIODeviceBase::OpenModeFlag" flags="QIODeviceBase::OpenMode"/>
-  <enum-type name="QLibraryInfo::LibraryLocation"/>
+  <enum-type name="QLibraryInfo::LibraryLocation" before-version="6" />
+  <enum-type name="QLibraryInfo::LibraryPath" since-version="6" />
   <enum-type name="QLibrary::LoadHint" flags="QLibrary::LoadHints"/>
   <enum-type name="QLocale::FormatType"/>
+  <enum-type name="QLocale::LanguageCodeType" flags="QLocale::LanguageCodeTypes" since-version="6"/>
   <enum-type name="QLocale::NumberOption" flags="QLocale::NumberOptions"/>
   <enum-type name="QLocale::MeasurementSystem"/>
   <enum-type name="QLocale::QuotationStyle"/>
@@ -723,10 +725,9 @@
   <enum-type name="QTimeLine::CurveShape"/>
   <enum-type name="QTimeLine::Direction"/>
   <enum-type name="QTimeLine::State"/>
-  <enum-type name="QUrl::FormattingOption" flags="QUrl::FormattingOptions"/>
   <enum-type name="QUrl::UrlFormattingOption" flags="QUrl::FormattingOptions"/>
   <enum-type name="QUrl::ComponentFormattingOption" flags="QUrl::ComponentFormattingOptions"/> <!-- Qt 5 -->
-  <enum-type name="QUrl::UrlFormattingOption"/> <!-- Qt 5 -->
+  <enum-type name="QUrl::AceProcessingOption" flags="QUrl::AceProcessingOptions" since-version="6"/>
   <enum-type name="QUrl::ParsingMode"/>
   <enum-type name="QUuid::Variant"/>
   <enum-type name="QUuid::Version"/>
@@ -848,6 +849,7 @@
   </enum-type>
 
   <value-type name="QProcessEnvironment"/>
+  <enum-type name="QProcessEnvironment::Initialization" since-version="6"/>
   <value-type name="QBasicTimer"/>
   <value-type name="QByteArrayMatcher">
     <modify-function signature="operator=(QByteArrayMatcher)" remove="all"/>
@@ -865,6 +867,7 @@
   <value-type name="QDateTime">
     <modify-function signature="operator=(QDateTime)" remove="all"/>
   </value-type>
+  <enum-type name="QDateTime::YearRange"/>
 
   <value-type name="QDir">
     <modify-function signature="QDir(QString,QString,QFlags&lt;QDir::SortFlag&gt;,QFlags&lt;QDir::Filter&gt;)">
@@ -884,6 +887,7 @@
     <modify-function signature="ry()" remove="all"/> 
   </value-type>
   <enum-type name="QLineF::IntersectType"/>
+  <enum-type name="QLineF::IntersectionType"/>
   <value-type name="QLineF"/>
   <value-type name="QLine"/>
 
@@ -1285,7 +1289,7 @@
     <!-- Can't provide same API and performance -->
 
     <modify-function signature="open(int,QFlags&lt;QIODevice::OpenModeFlag&gt;)" remove="all" before-version="6"/>
-    <modify-function signature="open(int,QFlags&lt;QIODeviceBase::OpenModeFlag&gt;,QFlags&lt;QFileDevice::FileHandleFlag&gt;)" remove="all" after-version="6"/>
+    <modify-function signature="open(int,QFlags&lt;QIODeviceBase::OpenModeFlag&gt;,QFlags&lt;QFileDevice::FileHandleFlag&gt;)" remove="all" since-version="6"/>
     <modify-function signature="decodeName(const char*)" remove="all"/>
     <modify-function signature="map(qint64,qint64,QFile::MemoryMapFlags)" remove="all"/>
     <modify-function signature="unmap(uchar*)" remove="all"/>
@@ -1794,6 +1798,7 @@
   <object-type name="QSysInfo"/>
   <object-type name="QLibrary"/>
   <object-type name="QResource"/>
+  <enum-type name="QResource::Compression"/>
   <object-type name="QSharedMemory"/>
   <object-type name="QMetaObject"/>
   <object-type name="QMetaMethod"/>
@@ -1980,6 +1985,7 @@
   <enum-type name="QRegularExpression::MatchType"/>
   <enum-type name="QRegularExpression::PatternOption" flags="QRegularExpression::PatternOptions"/>
   <enum-type name="QRegularExpression::MatchOption" flags="QRegularExpression::MatchOptions"/>
+  <enum-type name="QRegularExpression::WildcardConversionOption" flags="QRegularExpression::WildcardConversionOptions" since-version="6"/>
   <enum-type name="QMimeDatabase::MatchMode"/>
   <enum-type name="QCommandLineParser::SingleDashWordOptionMode"/>
   <enum-type name="QJsonDocument::JsonFormat"/>
@@ -1990,6 +1996,7 @@
   <enum-type name="QLockFile::LockError"/>
   <enum-type name="QTimeZone::TimeType"/>
   <enum-type name="QTimeZone::NameType"/>
+  <enum-type name="QTimeZone::Initialization" since-version="6.5"/>
   <enum-type name="QProcess::InputChannelMode"/>
   <enum-type name="QByteArray::Base64Option" flags="QByteArray::Base64Options"/>
   <enum-type name="QMetaType::Type"/>
@@ -2001,7 +2008,7 @@
   <enum-type name="QState::RestorePolicy"/>
   <enum-type name="QAccessible::TextBoundaryType"/>
   <enum-type name="QAccessible::InterfaceType"/>
-  <enum-type name="QFileDevice::MemoryMapFlags"/>
+  <enum-type name="QFileDevice::MemoryMapFlag" flags="QFileDevice::MemoryMapFlags"/>
   <enum-type name="QFileDevice::Permission" flags="QFileDevice::Permissions"/>
   <enum-type name="QFileDevice::FileError"/>
   <enum-type name="QFileDevice::FileHandleFlag" flags="QFileDevice::FileHandleFlags"/>
@@ -2015,9 +2022,11 @@
   <enum-type name="Qt::MouseEventFlag" flags="Qt::MouseEventFlags"/>
   <enum-type name="Qt::TimerType"/>
   <enum-type name="Qt::Edge"/>
+  <enum-type name="Qt::ColorScheme" since-version="6"/>
 
   <object-type name="QDeadlineTimer"/>
   <object-type name="QOperatingSystemVersionBase"/>
+  <enum-type name="QOperatingSystemVersionBase::OSType"/>
   <object-type name="QOperatingSystemVersion"/>
   <enum-type name="QOperatingSystemVersion::OSType"/>
   <object-type name="QRandomGenerator"/>

generator/typesystem_gui.xml

@@ -207,6 +207,7 @@
   <enum-type name="QMdiArea::WindowOrder"/>
   <enum-type name="QMdiArea::ViewMode"/>
   <enum-type name="QFileSystemModel::Roles"/>
+  <enum-type name="QFileSystemModel::Option" flags="QFileSystemModel::Options"/>
   <enum-type name="QFormLayout::FieldGrowthPolicy"/>
   <enum-type name="QFormLayout::FormStyle"/>
   <enum-type name="QFormLayout::ItemRole"/>
@@ -247,7 +248,8 @@
   <enum-type name="QFileDialog::FileMode"/>
   <enum-type name="QFileDialog::Option" flags="QFileDialog::Options"/>
   <enum-type name="QFileDialog::ViewMode"/>
-  <enum-type name="QFileIconProvider::IconType"/>
+  <enum-type name="QFileIconProvider::IconType" before-version="6"/>
+  <enum-type name="QAbstractFileIconProvider::IconType" since-version="6"/>
   <enum-type name="QFont::Stretch"/>
   <enum-type name="QFont::Style"/>
   <enum-type name="QFont::StyleStrategy"/>
@@ -571,7 +573,8 @@
   <enum-type name="QFontDatabase::SystemFont"/>
   <enum-type name="QStyleOptionToolBox::SelectedPosition"/>
   <enum-type name="QStyleOptionToolBox::TabPosition"/>
-  <enum-type name="QFileIconProvider::Option" flags="QFileIconProvider::Options"/>
+  <enum-type name="QFileIconProvider::Option" flags="QFileIconProvider::Options" before-version="6"/>
+  <enum-type name="QAbstractFileIconProvider::Option" flags="QAbstractFileIconProvider::Options" since-version="6"/>
   <enum-type name="QIconEngine::IconEngineHook"/>
   <enum-type name="QPagedPaintDevice::PageSize"/>
 
@@ -1266,6 +1269,7 @@ PyObject* constScanLine(QImage* image, int line) {
   </object-type>
   <object-type name="QDoubleValidator"/>
   <object-type name="QFileIconProvider"/>
+  <object-type name="QAbstractFileIconProvider" since-version="6"/>
   <object-type name="QWizard">
     <!-- ### Requires correct class name in meta object -->
     <modify-function signature="setDefaultProperty(const char *, const char *, const char *)" remove="all"/>
@@ -1653,9 +1657,19 @@ PyObject* constScanLine(QImage* image, int line) {
   <object-type name="QInputEvent">
     <modify-function signature="modifiers()const" access="non-final"/>
   </object-type>
-  <object-type name="QPointerEvent"/>
-  <object-type name="QEventPoint"/>
-  <object-type name="QSinglePointEvent"/>
+  <group since-version="6">
+    <object-type name="QPointerEvent"/>
+    <object-type name="QEventPoint"/>
+    <enum-type name="QEventPoint::State"  flags="QEventPoint::States" />
+    <object-type name="QSinglePointEvent"/>
+    <object-type name="QInputDevice"/>
+    <enum-type name="QInputDevice::Capability" flags="QInputDevice::Capabilities"/>
+    <enum-type name="QInputDevice::DeviceType" flags="QInputDevice::DeviceTypes"/>
+    <object-type name="QPointingDevice"/>
+    <enum-type name="QPointingDevice::PointerType" flags="QPointingDevice::PointerTypes"/>
+    <value-type name="QPointingDeviceUniqueId"/>
+  </group>
+  
   <object-type name="QGestureEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::Gesture || %1-&gt;type() == QEvent::GestureOverride"/>
   <object-type name="QKeyEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::KeyPress || %1-&gt;type() == QEvent::KeyRelease || %1-&gt;type() == QEvent::ShortcutOverride"/>
   <object-type name="QMouseEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::MouseButtonDblClick || %1-&gt;type() == QEvent::MouseButtonPress || %1-&gt;type() == QEvent::MouseButtonRelease || %1-&gt;type() == QEvent::MouseMove"/>

generator/typesystem_multimedia.xml

@@ -10,6 +10,11 @@
 
 <enum-type name="QAudioFormat::Endian"/>
 <enum-type name="QAudioFormat::SampleType"/>
+<group since-version="6">
+<enum-type name="QAudioFormat::ChannelConfig"/>
+<enum-type name="QAudioFormat::AudioChannelPosition"/>
+<enum-type name="QAudioFormat::SampleFormat"/>
+</group>
 <enum-type name="QSoundEffect::Status"/>
 <enum-type name="QSoundEffect::Loop"/>
 <enum-type name="QAbstractVideoBuffer::HandleType"/>
@@ -52,6 +57,7 @@
 <enum-type name="QCamera::Status"/>
 <enum-type name="QCamera::Error"/>
 <enum-type name="QCamera::CaptureMode" flags="QCamera::CaptureModes"/>
+<enum-type name="QCamera::Feature" flags="QCamera::Features" since-version="6"/>
 <enum-type name="QMediaPlayer::State"/>
 <enum-type name="QMediaPlayer::MediaStatus"/>
 <enum-type name="QMediaPlayer::Error"/>
@@ -75,7 +81,7 @@
 <enum-type name="QMediaStreamsControl::StreamType"/>
 
 <namespace-type name="QAudio"/>
-<namespace-type name="QMultimedia" after-version="5"/>
+<namespace-type name="QMultimedia" since-version="5"/>
 
 <object-type name="QAbstractVideoBuffer"/>
 <object-type name="QAbstractVideoSurface"/>
@@ -116,6 +122,11 @@
 <object-type name="QSoundEffect"/>
 <object-type name="QVideoEncoderSettings"/>
 <object-type name="QVideoFrame"/>
+<group since-version="6">
+<enum-type name="QVideoFrame::HandleType"/>
+<enum-type name="QVideoFrame::MapMode"/>
+<enum-type name="QVideoFrame::RotationAngle"/>
+</group>
 <object-type name="QVideoProbe"/>
 <object-type name="QVideoSurfaceFormat"/>
 <object-type name="QCameraViewfinder"/>
@@ -176,7 +187,7 @@
 
 <object-type name="QMediaServiceProviderPlugin"/>
 
-<group after-verson="6">
+<group since-version="6">
   <object-type name="QAudioDevice"/>
   <object-type name="QAudioSink"/>
   <object-type name="QAudioSource"/>
@@ -187,9 +198,16 @@
   <object-type name="QMediaCaptureSession"/>
   <object-type name="QMediaDevices"/>
   <object-type name="QMediaFormat"/>
+  <enum-type name="QMediaFormat::ResolveFlags"/>
   <object-type name="QMediaTimeRange::Interval"/>
   <object-type name="QScreenCapture"/>
   <object-type name="QVideoFrameFormat"/>
+  <enum-type name="QVideoFrameFormat::ColorSpace"/>
+  <enum-type name="QVideoFrameFormat::ColorRange"/>
+  <enum-type name="QVideoFrameFormat::Direction"/>
+  <enum-type name="QVideoFrameFormat::YCbCrColorSpace"/>
+  <enum-type name="QVideoFrameFormat::PixelFormat"/>
+  <enum-type name="QVideoFrameFormat::ColorTransfer"/>
   <object-type name="QVideoSink"/>
   <object-type name="QWindowCapture"/>
 </group>

generator/typesystem_network.xml

@@ -10,7 +10,11 @@
   <rejection class="QSslConfiguration" function-name="setDefaultDtlsConfiguration"/>
   <rejection class="QSslConfiguration" function-name="setDtlsCookieVerificationEnabled"/>
 
+  <enum-type name="QSsl::AlertLevel" since-version="6"/>
+  <enum-type name="QSsl::AlertType" since-version="6"/>
   <enum-type name="QSsl::AlternativeNameEntryType"/>
+  <enum-type name="QSsl::ImplementedClass" since-version="6.1"/>
+  <enum-type name="QSsl::SupportedFeature" since-version="6.1"/>
   <enum-type name="QSslConfiguration::NextProtocolNegotiationStatus"/>
   <enum-type name="QNetworkProxy::Capability" flags="QNetworkProxy::Capabilities"/>
   <enum-type name="QAbstractSocket::NetworkLayerProtocol"/>
@@ -42,6 +46,7 @@
   <enum-type name="QSsl::SslOption" flags="QSsl::SslOptions"/>
   <enum-type name="QLocalSocket::LocalSocketError"/>
   <enum-type name="QLocalSocket::LocalSocketState"/>
+  <enum-type name="QLocalSocket::SocketOption" flags="QLocalSocket::SocketOptions" since-version="6.2"/>
   <enum-type name="QNetworkAccessManager::Operation"/>
   <enum-type name="QNetworkAccessManager::NetworkAccessibility"/>
   <enum-type name="QNetworkAddressEntry::DnsEligibilityStatus"/>
@@ -172,6 +177,7 @@
   </value-type>
 
   <enum-type name="QSslError::SslError"/>
+  <enum-type name="QSslCertificate::PatternSyntax"/>
   <enum-type name="QSslCertificate::SubjectInfo"/>
   <enum-type name="QSslSocket::SslMode"/>
   <enum-type name="QSslSocket::PeerVerifyMode"/>

generator/typesystem_svg.xml

@@ -24,6 +24,7 @@
 
   <object-type name="QSvgGenerator">
   </object-type>
+  <enum-type name="QSvgGenerator::SvgVersion" since-version="6.5"/>
 
   <object-type name="QGraphicsSvgItem">
     <extra-includes>

generator/typesystem_webenginewidgets.xml

@@ -12,6 +12,8 @@
   <object-type name="QWebEngineFullScreenRequest"/>
   <object-type name="QWebEngineHistory"/>
   <object-type name="QWebEngineHistoryItem"/>
+  <object-type name="QWebEngineHistoryModel" since-version="6.2"/>
+  <enum-type name="QWebEngineHistoryModel::Roles" since-version="6.2"/>
   <object-type name="QWebEngineProfile"/>
   <object-type name="QWebEngineScript"/>
   <object-type name="QWebEngineScriptCollection"/>
@@ -38,6 +40,7 @@
   <enum-type name="QWebEngineScript::ScriptWorldId"/>
   <enum-type name="QWebEngineSettings::FontFamily"/>
   <enum-type name="QWebEngineSettings::FontSize"/>
+  <enum-type name="QWebEngineSettings::UnknownUrlSchemePolicy" since-version="5.11"/>
   <enum-type name="QWebEngineSettings::WebAttribute"/>
   <enum-type name="QWebEngineUrlRequestInfo::NavigationType"/>
   <enum-type name="QWebEngineUrlRequestInfo::ResourceType"/>

generator/typesystem_xml.xml

@@ -35,6 +35,7 @@
         <modify-function signature="nodeType()const" remove="all"/>
         <modify-function signature="operator=(QDomDocument)" remove="all"/>
     </value-type>
+    <enum-type name="QDomDocument::ParseOption" flags="QDomDocument::ParseOptions" since-version="6.5"/>
 
     <value-type name="QDomDocumentFragment">
         <modify-function signature="nodeType()const" remove="all"/>