diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-03-22 14:17:19 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-03-22 16:36:33 +0100 |
| commit | 5512a93e988992b1f22b3b3561b361a2903668ac (patch) | |
| tree | b19fb09c92185c0670cef2ef09f6d3ba82278e5b | |
| parent | 3fc86f701c90b6b0b2e8381a8f8f6d21af8e00e6 (diff) | |
Introduce QHashSeed
Qt 6.6 deprecates qSetGlobalQHashSeed() in favor of the class
QHashSeed introduced in 6.2
(qtbase/4ef99b8fbb3ba32df5591ac306fe8a7baa31c92c,
7ac0621ad1a649254e7d6175205e7ea22290b4d0).
[ChangeLog][PySide6] Class QHashSeed has been added.
Pick-to: 6.2
Change-Id: Ie87a945c217e5717b4068ef50303ef96319bb8e1
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
| -rw-r--r-- | sources/pyside6/PySide6/QtCore/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/QtCore/typesystem_core_common.xml | 2 | ||||
| -rw-r--r-- | sources/shiboken6/generator/main.cpp | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/sources/pyside6/PySide6/QtCore/CMakeLists.txt b/sources/pyside6/PySide6/QtCore/CMakeLists.txt index a149bd2db..5bd458cdb 100644 --- a/sources/pyside6/PySide6/QtCore/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtCore/CMakeLists.txt @@ -74,6 +74,7 @@ ${QtCore_GEN_DIR}/qfilesystemwatcher_wrapper.cpp ${QtCore_GEN_DIR}/qfutureinterfacebase_wrapper.cpp ${QtCore_GEN_DIR}/qgenericargument_wrapper.cpp ${QtCore_GEN_DIR}/qgenericreturnargument_wrapper.cpp +${QtCore_GEN_DIR}/qhashseed_wrapper.cpp ${QtCore_GEN_DIR}/qidentityproxymodel_wrapper.cpp ${QtCore_GEN_DIR}/qiodevice_wrapper.cpp ${QtCore_GEN_DIR}/qiodevicebase_wrapper.cpp diff --git a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml index 8bf51fde4..c8e46c286 100644 --- a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml +++ b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml @@ -457,6 +457,8 @@ </conversion-rule> </container-type> + <value-type name="QHashSeed" since="6.2"/> + <container-type name="QMap" type="map"> <include file-name="QMap" location="global"/> <conversion-rule> diff --git a/sources/shiboken6/generator/main.cpp b/sources/shiboken6/generator/main.cpp index 5c9d9320c..037a13130 100644 --- a/sources/shiboken6/generator/main.cpp +++ b/sources/shiboken6/generator/main.cpp @@ -442,7 +442,7 @@ int shibokenMain(int argc, char *argv[]) { // PYSIDE-757: Request a deterministic ordering of QHash in the code model // and type system. - qSetGlobalQHashSeed(0); + QHashSeed::setDeterministicGlobalSeed(); // needed by qxmlpatterns QCoreApplication app(argc, argv); ReportHandler::install(); |