From 8e8815b688684f5b267db1c2d8ac99c8f7f7637a Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Wed, 8 Mar 2023 10:09:13 -0800
Subject: [PATCH] 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>
---
 src/corelib/compat/removed_api.cpp              | 7 +++++++
 src/corelib/serialization/qcborstreamreader.cpp | 2 +-
 src/corelib/serialization/qcborstreamreader.h   | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/corelib/compat/removed_api.cpp b/src/corelib/compat/removed_api.cpp
index 9fe3827d86..99c08f1673 100644
--- a/src/corelib/compat/removed_api.cpp
+++ b/src/corelib/compat/removed_api.cpp
@@ -672,6 +672,13 @@ QByteArray QByteArray::chopped(qsizetype n) const
 { return sliced(0, size() - n); }
 #endif
 
+#include "qcborstreamreader.h"
+
+QCborError QCborStreamReader::lastError()
+{
+    return std::as_const(*this).lastError();
+}
+
 #include "qdatetime.h"
 
 QDateTime::QDateTime(QDate date, QTime time, const QTimeZone &timeZone)
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;