diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2021-11-27 11:27:51 -0600 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2022-02-15 17:00:04 -0800 |
| commit | dccd1e87f556c4c88044fa0c8a1c2f4f4c151f59 (patch) | |
| tree | 3858f95c2c89c2069e2489b1562e0bf8811087fd /src/corelib/serialization/qjsonobject.h | |
| parent | e99417106f4a2a7ef75cdf3317d950c30ad78ebe (diff) | |
QJsonValueConcreteRef: optimize concrete()
Inline the content to avoid a round-trip through qjsonarray.cpp and
qjsonobject.cpp.
This change revealed an inadviseable unit test check that dereferences
the end() iterator to get its type. I haven't changed it, but have
marked with ###. I also fixed a likely copy&paste mistake in that test.
Change-Id: I89446ea06b5742efb194fffd16bb774f3bfbe5f5
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/serialization/qjsonobject.h')
| -rw-r--r-- | src/corelib/serialization/qjsonobject.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/serialization/qjsonobject.h b/src/corelib/serialization/qjsonobject.h index e569d85192..d9f6785631 100644 --- a/src/corelib/serialization/qjsonobject.h +++ b/src/corelib/serialization/qjsonobject.h @@ -284,6 +284,7 @@ public: private: friend class QJsonValue; friend class QJsonDocument; + friend class QJsonPrivate::Value; friend class QJsonValueConstRef; friend class QJsonValueRef; friend class QCborMap; |