diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-03-18 15:23:56 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-03-18 22:27:24 +0000 |
| commit | dcf0ececbf167502ac9943c6435bb9ddeeb29d5e (patch) | |
| tree | 19416d427b84f0a90e0d3028588404a544003734 /src/corelib/json/qjsonvalue.cpp | |
| parent | 7aad6b9fd426e05fdfb3892d60432a45e4079887 (diff) | |
| parent | 198606f6dbca95ba3a170fff387327d8271018cd (diff) | |
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/json/qjsonvalue.cpp')
| -rw-r--r-- | src/corelib/json/qjsonvalue.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/json/qjsonvalue.cpp b/src/corelib/json/qjsonvalue.cpp index 4845d8c876..c8ddfbc2cc 100644 --- a/src/corelib/json/qjsonvalue.cpp +++ b/src/corelib/json/qjsonvalue.cpp @@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE \class QJsonValue \inmodule QtCore \ingroup json + \ingroup shared \reentrant \since 5.0 |