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/QtWebSockets/typesystem_websockets.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/QtWebSockets/typesystem_websockets.xml')
-rw-r--r-- | sources/pyside2/PySide2/QtWebSockets/typesystem_websockets.xml | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sources/pyside2/PySide2/QtWebSockets/typesystem_websockets.xml b/sources/pyside2/PySide2/QtWebSockets/typesystem_websockets.xml index 6b26ccd76..cd81439cb 100644 --- a/sources/pyside2/PySide2/QtWebSockets/typesystem_websockets.xml +++ b/sources/pyside2/PySide2/QtWebSockets/typesystem_websockets.xml @@ -43,7 +43,7 @@ <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> <load-typesystem name="QtNetwork/typesystem_network.xml" generate="no"/> - <object-type name="QMaskGenerator" /> + <object-type name="QMaskGenerator"/> <object-type name="QWebSocket"> <extra-includes> @@ -51,7 +51,7 @@ </extra-includes> </object-type> - <object-type name="QWebSocketCorsAuthenticator" /> + <object-type name="QWebSocketCorsAuthenticator"/> <namespace-type name="QWebSocketProtocol"> <enum-type name="Version"/> @@ -59,20 +59,20 @@ </namespace-type> <object-type name="QWebSocketServer"> - <enum-type name="SslMode" /> + <enum-type name="SslMode"/> <extra-includes> - <include file-name="QWebSocketCorsAuthenticator" location="global" /> + <include file-name="QWebSocketCorsAuthenticator" location="global"/> </extra-includes> </object-type> <!-- TODO: Gracefully handle the lack of SSL support --> - <rejection class="QWebSocket" function-name="ignoreSslErrors" /> - <rejection class="QWebSocket" function-name="setSslConfiguration" /> - <rejection class="QWebSocket" function-name="sslConfiguration" /> - <rejection class="QWebSocket" function-name="ignoreSslErrors" /> - <rejection class="QWebSocket" function-name="sslErrors" /> - <rejection class="QWebSocketServer" function-name="setSslConfiguration" /> - <rejection class="QWebSocketServer" function-name="sslConfiguration" /> - <rejection class="QWebSocketServer" function-name="peerVerifyError" /> - <rejection class="QWebSocketServer" function-name="sslErrors" /> + <rejection class="QWebSocket" function-name="ignoreSslErrors"/> + <rejection class="QWebSocket" function-name="setSslConfiguration"/> + <rejection class="QWebSocket" function-name="sslConfiguration"/> + <rejection class="QWebSocket" function-name="ignoreSslErrors"/> + <rejection class="QWebSocket" function-name="sslErrors"/> + <rejection class="QWebSocketServer" function-name="setSslConfiguration"/> + <rejection class="QWebSocketServer" function-name="sslConfiguration"/> + <rejection class="QWebSocketServer" function-name="peerVerifyError"/> + <rejection class="QWebSocketServer" function-name="sslErrors"/> </typesystem> |