diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-04-21 15:05:32 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-04-21 15:05:54 +0200 |
| commit | cef4c17fc8d4c8de4707f8a37427d37feb2012f9 (patch) | |
| tree | d246fa8d8aca8ce9fabd1393fd931fb82adfd86e /PySide2/QtNetwork | |
| parent | 391f9ccb5a2e46ab6649a552a29768d4bb7b6db3 (diff) | |
| parent | adeecf5706215dc3a150a281af3a9bf2ac28e1da (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: I7906cfb72af65bea9f46a0684562ffaaa273bab2
Diffstat (limited to 'PySide2/QtNetwork')
| -rw-r--r-- | PySide2/QtNetwork/typesystem_network.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/PySide2/QtNetwork/typesystem_network.xml b/PySide2/QtNetwork/typesystem_network.xml index d2150a9a..2f8424ac 100644 --- a/PySide2/QtNetwork/typesystem_network.xml +++ b/PySide2/QtNetwork/typesystem_network.xml @@ -177,6 +177,7 @@ </object-type> <value-type name="QHostAddress" hash-function="qHash"> + <enum-type name="ConversionModeFlag" flags="ConversionMode" since="5.8"/> <enum-type name="SpecialAddress"/> <!-- ### QHostAddress(QIPv6Address) does this --> <modify-function signature="QHostAddress(quint8*)" remove="all" /> @@ -259,6 +260,7 @@ <enum-type name="Priority" since="4.7"/> <enum-type name="CacheLoadControl"/> <enum-type name="KnownHeaders"/> + <enum-type name="RedirectPolicy" since="5.9"/> </value-type> <value-type name="QNetworkConfiguration" since="4.7"> |