Skip to content

Commit 7390c0a

Browse files
committed
Add some entries to typesystem files missing for Qt6
1 parent f9f6ba6 commit 7390c0a

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

generator/typesystem_core.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -693,6 +693,7 @@
693693
<enum-type name="QFile::Permission" flags="QFile::Permissions"/>
694694
<enum-type name="QFile::FileHandleFlag" flags="QFile::FileHandleFlags"/>
695695
<enum-type name="QIODevice::OpenModeFlag" flags="QIODevice::OpenMode"/>
696+
<enum-type name="QIODeviceBase::OpenModeFlag" flags="QIODeviceBase::OpenMode"/>
696697
<enum-type name="QLibraryInfo::LibraryLocation"/>
697698
<enum-type name="QLibrary::LoadHint" flags="QLibrary::LoadHints"/>
698699
<enum-type name="QLocale::FormatType"/>
@@ -1282,11 +1283,13 @@
12821283
<!-- Can't provide same API and performance -->
12831284

12841285
<modify-function signature="open(int,QFlags&lt;QIODevice::OpenModeFlag&gt;)" remove="all"/>
1286+
<modify-function signature="open(int,QFlags&lt;QIODeviceBase::OpenModeFlag&gt;)" remove="all"/>
12851287
<modify-function signature="decodeName(const char*)" remove="all"/>
12861288
<modify-function signature="map(qint64,qint64,QFile::MemoryMapFlags)" remove="all"/>
12871289
<modify-function signature="unmap(uchar*)" remove="all"/>
12881290
</object-type>
12891291

1292+
<interface-type name="QIODeviceBase"/>
12901293
<object-type name="QIODevice">
12911294
<modify-function signature="peek(char *,qint64)" remove="all"/>
12921295
<modify-function signature="read(char *,qint64)" remove="all"/>
@@ -1301,6 +1304,7 @@
13011304
</object-type>
13021305
<object-type name="QLibraryInfo"/>
13031306
<object-type name="QMutex"/>
1307+
<object-type name="QRecursiveMutex"/>
13041308
<value-type name="QMutexLocker">
13051309
<!-- special handling for context handlers -->
13061310
<inject-code class="pywrap-operators">PythonQt::Type_EnterExit</inject-code>
@@ -2011,6 +2015,7 @@
20112015
<enum-type name="Qt::Edge"/>
20122016

20132017
<object-type name="QDeadlineTimer"/>
2018+
<object-type name="QOperatingSystemVersionBase"/>
20142019
<object-type name="QOperatingSystemVersion"/>
20152020
<enum-type name="QOperatingSystemVersion::OSType"/>
20162021
<object-type name="QRandomGenerator"/>

generator/typesystem_gui.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1653,6 +1653,9 @@ PyObject* constScanLine(QImage* image, int line) {
16531653
<object-type name="QInputEvent">
16541654
<modify-function signature="modifiers()const" access="non-final"/>
16551655
</object-type>
1656+
<object-type name="QPointerEvent"/>
1657+
<object-type name="QEventPoint"/>
1658+
<object-type name="QSinglePointEvent"/>
16561659
<object-type name="QGestureEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::Gesture || %1-&gt;type() == QEvent::GestureOverride"/>
16571660
<object-type name="QKeyEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::KeyPress || %1-&gt;type() == QEvent::KeyRelease || %1-&gt;type() == QEvent::ShortcutOverride"/>
16581661
<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"/>

0 commit comments

Comments
 (0)