diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-18 13:15:38 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-12-18 13:15:38 +0000 |
| commit | d44cd5334a97f30a50295c385f855d751c187b9e (patch) | |
| tree | 45f29d64ba376138c1095b5c64d9c2481d92d801 /src/corelib/json/qjsonobject.h | |
| parent | 8b1eb5f4202fb4120a303cd2183bb96f212c5a32 (diff) | |
| parent | beb65dcd79f8c354dab7bb4a8d08157bd9d69329 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/json/qjsonobject.h')
| -rw-r--r-- | src/corelib/json/qjsonobject.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/json/qjsonobject.h b/src/corelib/json/qjsonobject.h index 19c938fd83..5b475f52ae 100644 --- a/src/corelib/json/qjsonobject.h +++ b/src/corelib/json/qjsonobject.h @@ -104,6 +104,7 @@ public: typedef int difference_type; typedef QJsonValue value_type; typedef QJsonValueRef reference; + typedef QJsonValuePtr pointer; Q_DECL_CONSTEXPR inline iterator() : o(Q_NULLPTR), i(0) {} Q_DECL_CONSTEXPR inline iterator(QJsonObject *obj, int index) : o(obj), i(index) {} @@ -146,6 +147,7 @@ public: typedef int difference_type; typedef QJsonValue value_type; typedef QJsonValue reference; + typedef QJsonValuePtr pointer; Q_DECL_CONSTEXPR inline const_iterator() : o(Q_NULLPTR), i(0) {} Q_DECL_CONSTEXPR inline const_iterator(const QJsonObject *obj, int index) |