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/jsruntime/qv4qobjectwrapper.cpp | |
| 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/jsruntime/qv4qobjectwrapper.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4qobjectwrapper.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp index 720324ea42..8c8e05dbb7 100644 --- a/src/qml/jsruntime/qv4qobjectwrapper.cpp +++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp @@ -1404,11 +1404,10 @@ static int MatchScore(const QV4::Value &actual, int conversionType) } } else if (actual.as<QV4::RegExpObject>()) { switch (conversionType) { - case QMetaType::QRegExp: #if QT_CONFIG(regularexpression) case QMetaType::QRegularExpression: -#endif return 0; +#endif default: return 10; } |