diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-18 11:07:51 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-18 11:07:51 +0200 |
| commit | 0ca4fcbc36527ce02b604aa88e8bd0d37d40baf4 (patch) | |
| tree | 6adf165fb783272d720416a49a51d9ad169d16de /src/corelib/json | |
| parent | 9aeaa363e533e1486e6e9d7526bbab7c2472be5e (diff) | |
| parent | 748aa6b06462804a9671997302df292ae9788d5c (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/platforms/xcb/qxcbintegration.cpp
Change-Id: I2d71d06a55f730df19ace0dd3304238584a0497f
Diffstat (limited to 'src/corelib/json')
| -rw-r--r-- | src/corelib/json/qjsonvalue.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/json/qjsonvalue.h b/src/corelib/json/qjsonvalue.h index 1ce7f745e0..a853acaddd 100644 --- a/src/corelib/json/qjsonvalue.h +++ b/src/corelib/json/qjsonvalue.h @@ -82,7 +82,7 @@ public: QJsonValue(QLatin1String s); #ifndef QT_NO_CAST_FROM_ASCII inline QT_ASCII_CAST_WARN QJsonValue(const char *s) - : d(0), t(String) { stringDataFromQStringHelper(QString::fromUtf8(s)); } + : d(Q_NULLPTR), t(String) { stringDataFromQStringHelper(QString::fromUtf8(s)); } #endif QJsonValue(const QJsonArray &a); QJsonValue(const QJsonObject &o); |