summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qvariant.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-07-29 15:04:23 +0200
committerLars Knoll <lars.knoll@qt.io>2020-08-24 00:19:42 +0200
commit02dfec920951afc1c512aa41fd10b025ae1fbbb2 (patch)
tree9cd6e85b330b85452faf1315f032b8eca5baf23b /src/corelib/kernel/qvariant.cpp
parent0161f00e5043090f22b23de9822c09062b17d675 (diff)
Remove QVariant(QDataStream) constructor
The constructor wasn't constructing a QVariant holding a QDataStream, bug loading the variant from the datastream. This is opposed to how QDataStream works in all other places, and also not in line with all other constructors for QVariant. [ChangeLog][QtCore][QVariant] Removed the QVariant(QDataStream) constructor. Use QVariant().load(datastream) instead. Change-Id: I6ac54e12166b9383c09c3940eef2516f896fd359 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel/qvariant.cpp')
-rw-r--r--src/corelib/kernel/qvariant.cpp11
1 files changed, 0 insertions, 11 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index b21ded3186..06c5ea4048 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -538,17 +538,6 @@ QVariant::QVariant(const QVariant &p)
t.construct(&d, p.constData());
}
-#ifndef QT_NO_DATASTREAM
-/*!
- Reads the variant from the data stream, \a s.
-*/
-QVariant::QVariant(QDataStream &s)
-{
- d.is_null = true;
- s >> *this;
-}
-#endif //QT_NO_DATASTREAM
-
/*!
\fn QVariant::QVariant(const QString &val)