summaryrefslogtreecommitdiffstats
path: root/src/corelib/serialization
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2023-03-08 10:09:13 -0800
committerThiago Macieira <thiago.macieira@intel.com>2023-11-24 12:42:12 -0800
commit8e8815b688684f5b267db1c2d8ac99c8f7f7637a (patch)
treeda39dfd5b9e81fc4cb81da4aa73c5d8f347fea6c /src/corelib/serialization
parent23a1ac7d407276055bbf2d232198d509906bd314 (diff)
QCborStreamReader: fix API mistake: lastError() wasn't const
[ChangeLog][QtCore][QCborStreamReader] Fixed lastError() not being declared as a const member. Change-Id: Ib1d2fc7100134f7597cdfffd174a8401b43576d4 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/serialization')
-rw-r--r--src/corelib/serialization/qcborstreamreader.cpp2
-rw-r--r--src/corelib/serialization/qcborstreamreader.h3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/corelib/serialization/qcborstreamreader.cpp b/src/corelib/serialization/qcborstreamreader.cpp
index a3053953ac..47d1f8e014 100644
--- a/src/corelib/serialization/qcborstreamreader.cpp
+++ b/src/corelib/serialization/qcborstreamreader.cpp
@@ -929,7 +929,7 @@ void QCborStreamReader::reset()
\sa isValid()
*/
-QCborError QCborStreamReader::lastError()
+QCborError QCborStreamReader::lastError() const
{
return d->lastError;
}
diff --git a/src/corelib/serialization/qcborstreamreader.h b/src/corelib/serialization/qcborstreamreader.h
index cc4b9cdf42..5a870d17a3 100644
--- a/src/corelib/serialization/qcborstreamreader.h
+++ b/src/corelib/serialization/qcborstreamreader.h
@@ -77,7 +77,10 @@ public:
void clear();
void reset();
+#if QT_CORE_REMOVED_SINCE(6, 6)
QCborError lastError();
+#endif
+ QCborError lastError() const;
qint64 currentOffset() const;