Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 10:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ensure the type name is streamed as QByteArray in QVariant::save()

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-11-03 16:36:28 +02:00
parent 7f04979b7e
commit 35f05e0d94
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/io/qdatastream.h
View file

@ -107,6 +107,10 @@ public:
int skipRawData(int len); int skipRawData(int len);
private: private:
// ASCII is ambiguous, write either QString or QByteArray
QDataStream &operator<<(const char *str);
QDataStream &operator>>(char *&str);
Q_DISABLE_COPY(QDataStream) Q_DISABLE_COPY(QDataStream)
QIODevice *dev; QIODevice *dev;

2
src/core/kernel/qvariant.cpp
View file

@ -1687,7 +1687,7 @@ void QVariant::save(QDataStream &s) const
s << tp; s << tp;
s << qint8(d_ptr ? d_ptr->is_null : true); s << qint8(d_ptr ? d_ptr->is_null : true);
if (tp == QVariant::UserType) { if (tp == QVariant::UserType) {
s << QMetaType::typeName(userType()); s << QByteArray(QMetaType::typeName(userType()));
} }
if (!isValid()) { if (!isValid()) {