diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@digia.com> | 2014-09-10 10:52:14 +0200 |
|---|---|---|
| committer | Jędrzej Nowacki <jedrzej.nowacki@digia.com> | 2014-09-11 10:54:42 +0200 |
| commit | fa9a407b9f7b89e4785c650dcb3e80d08ea3c042 (patch) | |
| tree | 87a85efb95e21e248b95904b834370b956e804b6 /src/corelib/json/qjsonvalue.h | |
| parent | 7b9f7f3891230ddd2b2ef5cf3c760a605a02ee96 (diff) | |
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 <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/corelib/json/qjsonvalue.h')
| -rw-r--r-- | src/corelib/json/qjsonvalue.h | 2 |
1 files changed, 0 insertions, 2 deletions
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 |