diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-25 11:23:46 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-02-25 11:23:46 +0000 |
| commit | 2cac171ddedfecdfc6fa27c5326f9eebfab1822e (patch) | |
| tree | ff8e7c162875d7374ddc42224a91533b7e8c8663 /src/corelib/json/qjsonobject.cpp | |
| parent | 5113fdeb7d50979c6acbe2c9c5b26ad134614873 (diff) | |
| parent | 709e40093e6081b18e0d3003e0a088e1a9b6f211 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/json/qjsonobject.cpp')
| -rw-r--r-- | src/corelib/json/qjsonobject.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/json/qjsonobject.cpp b/src/corelib/json/qjsonobject.cpp index bdedc3f17b..22bad6f8a2 100644 --- a/src/corelib/json/qjsonobject.cpp +++ b/src/corelib/json/qjsonobject.cpp @@ -264,6 +264,8 @@ QVariantHash QJsonObject::toVariantHash() const /*! Returns a list of all keys in this object. + + The list is sorted lexographically. */ QStringList QJsonObject::keys() const { |