diff options
| author | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2018-10-11 17:45:43 +0200 |
|---|---|---|
| committer | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2018-11-22 17:00:11 +0000 |
| commit | a57a202a70801f766094c3ed11664b03c9a6a3e4 (patch) | |
| tree | 73c2c1f4fc902ccbc10b73811bbf299a2c555728 /sources/pyside2/PySide2/QtCore/typesystem_core_win.xml | |
| parent | f93a7369657814206bfbce49817c8fbd9a1bfcba (diff) | |
Move inject-code snippets to separate files
When code must be modified or added to certain
functions, we currently have two options:
* Write a template and include it into the typesystem,
* inject code directly at a certain place of the function entry.
The problem with injecting raw code is that since it is an XML
file, one need to escape protected symbols, like "<" and "&".
Thanks to a couple of complementary commits, now we can place
this code snippets on a separate file without triggering
a whole module compiling process, since the typesystem itself
will not be alterered.
All the injected code from the typesystem was removed
and placed into a single file per module inside a top-level directory
called glue.
Some small fixes were included mainly regarding styling
of the code.
Task-number: PYSIDE-834
Change-Id: I823e92d241a528d75d5940090008db9bf297f49e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'sources/pyside2/PySide2/QtCore/typesystem_core_win.xml')
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/typesystem_core_win.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_win.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_win.xml index 410187281..afd733b35 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_win.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_win.xml @@ -43,7 +43,7 @@ <extra-includes> <include file-name="windows.h" location="global"/> </extra-includes> - <primitive-type name="Qt::HANDLE" target-lang-api-name="PyObject" /> + <primitive-type name="Qt::HANDLE" target-lang-api-name="PyObject"/> <primitive-type name="HWND"> <!-- Qt5: Add this include there to insert ti in the global qtcore header (needed by qprocess_wrapper) --> <include file-name="wtypes.h" location="global"/> @@ -74,7 +74,7 @@ </inject-code> <!-- Qt5: had to move QAbstractEventDispatcher into os-specific files because of Windows --> - <object-type name="QWinEventNotifier" /> + <object-type name="QWinEventNotifier"/> <object-type name="QAbstractEventDispatcher"> <modify-function signature="processEvents(QFlags<QEventLoop::ProcessEventsFlag>)" allow-thread="yes"/> <!-- Qt5: had to add this recursive object def. This was crucial to get rid of "pure virtual" --> @@ -83,8 +83,8 @@ <object-type name="QSysInfo"> <enum-type name="Endian"/> <enum-type name="Sizes"/> - <enum-type name="WinVersion" since="5.5" /> + <enum-type name="WinVersion" since="5.5"/> </object-type> - <suppress-warning text="skipping field 'QSysInfo::MacintoshVersion' with unmatched type 'QSysInfo::MacVersion'" /> - <suppress-warning text="enum 'QSysInfo::MacVersion' does not have a type entry or is not an enum" /> + <suppress-warning text="skipping field 'QSysInfo::MacintoshVersion' with unmatched type 'QSysInfo::MacVersion'"/> + <suppress-warning text="enum 'QSysInfo::MacVersion' does not have a type entry or is not an enum"/> </typesystem> |