diff options
| author | Christian Tismer <tismer@stackless.com> | 2016-11-16 14:07:32 +0100 |
|---|---|---|
| committer | Christian Tismer <tismer@stackless.com> | 2016-11-17 10:26:57 +0000 |
| commit | 1d59019aa148989891cc3adb96c7b771f751ad6c (patch) | |
| tree | d6f7bec7247c7b4b9dec8a25727d99c463fba709 | |
| parent | 978807606c4e169e37400bdce3fc914fd85db2c2 (diff) | |
Fix the QtCore XML
The QtCore XML has two bugs with unknown effect.
Checked all XML files with xmllint and got these two errors.
Correction: The repeated attribute seems to be right.
The remaining bug did not change any test. (26 failed of 394)
Change-Id: Idd85e560232283e9258d3eb8e640353c46d88712
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | PySide2/QtCore/typesystem_core_common.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/PySide2/QtCore/typesystem_core_common.xml b/PySide2/QtCore/typesystem_core_common.xml index 1d3cec93..57127f8a 100644 --- a/PySide2/QtCore/typesystem_core_common.xml +++ b/PySide2/QtCore/typesystem_core_common.xml @@ -413,7 +413,7 @@ return 0; bool valueType = '*' != typeName[qstrlen(typeName) - 1]; // Do not convert user type of value - if (valueType &∓ Shiboken::ObjectType::isUserType(type)) + if (valueType && Shiboken::ObjectType::isUserType(type)) return 0; int obTypeId = QMetaType::type(typeName); if (obTypeId) { @@ -2331,6 +2331,7 @@ <value-type name="QUrl" hash-function="PySide::hash"> <!-- Qt5: lots of changes --> <enum-type name="ComponentFormattingOption" flags="ComponentFormattingOptions" flags="FormattingOptions"/> + <!-- note: above duplication of attribute is not by default XML compliant! --> <enum-type name="UrlFormattingOption" /> <enum-type name="UserInputResolutionOption" flags="UserInputResolutionOptions"/> <enum-type name="ParsingMode"/> |