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_p.h | |
| 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_p.h')
| -rw-r--r-- | src/corelib/kernel/qmetatype_p.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/corelib/kernel/qmetatype_p.h b/src/corelib/kernel/qmetatype_p.h index e4e2aa9e43..8e08d84ffd 100644 --- a/src/corelib/kernel/qmetatype_p.h +++ b/src/corelib/kernel/qmetatype_p.h @@ -164,9 +164,6 @@ template<> struct TypeDefinition<QLineF> { static const bool IsAvailable = false template<> struct TypeDefinition<QPoint> { static const bool IsAvailable = false; }; template<> struct TypeDefinition<QPointF> { static const bool IsAvailable = false; }; #endif -#ifdef QT_NO_REGEXP -template<> struct TypeDefinition<QRegExp> { static const bool IsAvailable = false; }; -#endif #if !QT_CONFIG(regularexpression) template<> struct TypeDefinition<QRegularExpression> { static const bool IsAvailable = false; }; #endif |