diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-04-02 11:07:14 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-04-03 21:02:23 +0200 |
| commit | fb3552e0d152e963d74cccc7b36f4e618638b722 (patch) | |
| tree | 6f1bc18f3cc8e01387edc8c07ff5cde8993cb3a9 /src/qml/qml | |
| parent | cc6c5ae70b1389ed86301bbfc156628e1d3abbcd (diff) | |
Remove QRegExp support from QtQml
Remove all code that supported converting between JS RegExp's and
QRegExp, as QRegExp is going away in Qt6.
Change-Id: I4863e68dd87a337d7e836d1b26c28ee3bb914e9f
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/qml')
| -rw-r--r-- | src/qml/qml/qqmlobjectcreator.cpp | 3 | ||||
| -rw-r--r-- | src/qml/qml/qqmlpropertyvalidator.cpp | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp index c8564ba294..cbf243b9c1 100644 --- a/src/qml/qml/qqmlobjectcreator.cpp +++ b/src/qml/qml/qqmlobjectcreator.cpp @@ -624,9 +624,6 @@ void QQmlObjectCreator::setPropertyValue(const QQmlPropertyData *property, const property->writeProperty(_qobject, &vec, propertyWriteFlags); } break; - case QMetaType::QRegExp: - assertOrNull(!"not possible"); - break; default: { // generate single literal value assignment to a list property if required if (property->propType() == qMetaTypeId<QList<qreal> >()) { diff --git a/src/qml/qml/qqmlpropertyvalidator.cpp b/src/qml/qml/qqmlpropertyvalidator.cpp index 13995d6001..d7afffeaf9 100644 --- a/src/qml/qml/qqmlpropertyvalidator.cpp +++ b/src/qml/qml/qqmlpropertyvalidator.cpp @@ -596,7 +596,6 @@ QQmlError QQmlPropertyValidator::validateLiteralBinding(QQmlPropertyCache *prope } } break; - case QMetaType::QRegExp: case QMetaType::QRegularExpression: return warnOrError(tr("Invalid property assignment: regular expression expected; use /pattern/ syntax")); default: { |