From fa9a407b9f7b89e4785c650dcb3e80d08ea3c042 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Wed, 10 Sep 2014 10:52:14 +0200 Subject: Revert "Reading QJsonObject property should not modify the object itself." This reverts commit 20cf632ad5f3ffe7b0fd231724c971f4e07304eb. The commit produced to many problems during statics destruction. For example causing QtCreator crash (QTBUG-40987). Change-Id: Ib52f6a449c2d84deab2de792559a6a065ca45e8d Reviewed-by: Thiago Macieira Reviewed-by: Lars Knoll --- src/corelib/json/qjsonvalue.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/corelib/json/qjsonvalue.h') diff --git a/src/corelib/json/qjsonvalue.h b/src/corelib/json/qjsonvalue.h index 2d0453f130..a35ab9ef4a 100644 --- a/src/corelib/json/qjsonvalue.h +++ b/src/corelib/json/qjsonvalue.h @@ -149,7 +149,6 @@ public: : a(array), is_object(false), index(idx) {} QJsonValueRef(QJsonObject *object, int idx) : o(object), is_object(true), index(idx) {} - inline QJsonValueRef(QJsonObject *object, const QString &key); inline operator QJsonValue() const { return toValue(); } QJsonValueRef &operator = (const QJsonValue &val); @@ -189,7 +188,6 @@ private: }; uint is_object : 1; uint index : 31; - struct UnionHelper; }; #ifndef Q_QDOC -- cgit v1.2.3