From 51a2ec2d6ac93581561df602cb6a65afbd541ce3 Mon Sep 17 00:00:00 2001 From: Luca Beldi Date: Mon, 30 Oct 2017 11:10:50 +0000 Subject: [PATCH] QDataStream operators use fixed size integers. Solves Bug 63765 --- src/gui/itemmodels/qstandarditemmodel_p.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui/itemmodels/qstandarditemmodel_p.h b/src/gui/itemmodels/qstandarditemmodel_p.h index 516cce8..4a4a2ef 100644 --- a/src/gui/itemmodels/qstandarditemmodel_p.h +++ b/src/gui/itemmodels/qstandarditemmodel_p.h @@ -79,14 +79,16 @@ Q_DECLARE_TYPEINFO(QStandardItemData, Q_MOVABLE_TYPE); inline QDataStream &operator>>(QDataStream &in, QStandardItemData &data) { - in >> data.role; + if(in.version()>= Qt_5_12){ + qint32 tempRole; + in >> tempRole; + data.role=tempRole; + } + else{ + in >> data.role; + } in >> data.value; return in; } inline QDataStream &operator<<(QDataStream &out, const QStandardItemData &data) { - out << data.role; + if(in.version()>= Qt_5_12) + out << static_cast(data.role); + else + out << data.role; out << data.value; return out; } -- 1.9.4.msysgit.2