diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-04-03 20:58:30 +0200 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-05-14 12:19:47 +0000 |
| commit | 45ed28a9d3790707b18798454d976f3a818a7740 (patch) | |
| tree | a757ffb39ed2a9a5891cb56affc81db9617f7a68 /src/corelib/kernel/qmetatype.cpp | |
| parent | b2ee684a13d01363c121d3ba597feaf274786fdb (diff) | |
Remove QRegExp from QVariant
Add an operator QVariant() to QRegExp to keep things at source compatible
as possible.
Add a hack to QVariant::load/save() to recognize the old typeid
for QRegExp and stream them correctly as long as the streaming operators
for QRegExp are registered.
Also move the datastream test for QRegExp to tst_qregexp, and adjust it to
the qvariant changes.
Change-Id: I120b38a7541b43ec07a21b17f7f35c55f071eb75
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/corelib/kernel/qmetatype.cpp')
| -rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index c34e442cdb..dfb6842d13 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -53,7 +53,6 @@ #include "quuid.h" #include "qvariant.h" #include "qdatastream.h" -#include "qregexp.h" #include "qmetatypeswitcher_p.h" #if QT_CONFIG(regularexpression) @@ -352,7 +351,6 @@ Q_GLOBAL_STATIC(QMetaTypeCustomRegistry, customTypeRegistry) \value QRect QRect \value QPoint QPoint \value QUrl QUrl - \value QRegExp QRegExp \value QRegularExpression QRegularExpression \value QDateTime QDateTime \value QPointF QPointF |