diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-18 10:19:37 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-18 15:04:50 +0200 |
| commit | 8728594d6b2e0f3df3e3726b67cf23715dfdcbe3 (patch) | |
| tree | 05a368cc64056022eae6d4c2290f6a696858d5ad /sources/shiboken2/ApiExtractor/typesystemparser.cpp | |
| parent | d1fb46645309780437743052159468f743e28d68 (diff) | |
shiboken2: Remove workaround code for comparing QStringView
The underlying issue has been fixed.
Task-number: QTBUG-69389
Change-Id: I67416a9db7488db5f851ecb2f07884fbb410e4f0
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/shiboken2/ApiExtractor/typesystemparser.cpp')
| -rw-r--r-- | sources/shiboken2/ApiExtractor/typesystemparser.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/sources/shiboken2/ApiExtractor/typesystemparser.cpp b/sources/shiboken2/ApiExtractor/typesystemparser.cpp index a56c5c698..6979a7a4e 100644 --- a/sources/shiboken2/ApiExtractor/typesystemparser.cpp +++ b/sources/shiboken2/ApiExtractor/typesystemparser.cpp @@ -1019,7 +1019,6 @@ bool TypeSystemParser::importFileElement(const QXmlStreamAttributes &atts) static bool convertBoolean(QStringView value, const QString &attributeName, bool defaultValue) { -#ifdef QTBUG_69389_FIXED if (value.compare(trueAttributeValue(), Qt::CaseInsensitive) == 0 || value.compare(yesAttributeValue(), Qt::CaseInsensitive) == 0) { return true; @@ -1028,16 +1027,6 @@ static bool convertBoolean(QStringView value, const QString &attributeName, bool || value.compare(noAttributeValue(), Qt::CaseInsensitive) == 0) { return false; } -#else - if (QtPrivate::compareStrings(value, trueAttributeValue(), Qt::CaseInsensitive) == 0 - || QtPrivate::compareStrings(value, yesAttributeValue(), Qt::CaseInsensitive) == 0) { - return true; - } - if (QtPrivate::compareStrings(value, falseAttributeValue(), Qt::CaseInsensitive) == 0 - || QtPrivate::compareStrings(value, noAttributeValue(), Qt::CaseInsensitive) == 0) { - return false; - } -#endif const QString warn = QStringLiteral("Boolean value '%1' not supported in attribute '%2'. Use 'yes' or 'no'. Defaulting to '%3'.") .arg(value) .arg(attributeName, |