diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-02 10:35:25 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-03 00:12:05 +0200 |
| commit | 93dad2bf91d414a41c6e2c7db6c75171b4917d4d (patch) | |
| tree | f3684b5dd6cece6b6e791c8e7551f63871b44890 /src/corelib/serialization | |
| parent | b73d5a0511bed8c3ccc504e74c52a61d4d3749b4 (diff) | |
Switch Q_DECL_DEPRECATED to use C++14 [[deprecated]]
As a C++ attribute it must be on the beginning of the line or after
the function name however. And for friend declarations can only
be on the definition.
Change-Id: I456884428f36e1f1c621089c7b1addee13ada0fe
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/serialization')
| -rw-r--r-- | src/corelib/serialization/qjsonvalue.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/serialization/qjsonvalue.h b/src/corelib/serialization/qjsonvalue.h index 2e99103411..a9dd86df19 100644 --- a/src/corelib/serialization/qjsonvalue.h +++ b/src/corelib/serialization/qjsonvalue.h @@ -77,7 +77,7 @@ public: QJsonValue(const QString &s); QJsonValue(QLatin1String s); #ifndef QT_NO_CAST_FROM_ASCII - inline QT_ASCII_CAST_WARN QJsonValue(const char *s) + QT_ASCII_CAST_WARN inline QJsonValue(const char *s) : QJsonValue(QString::fromUtf8(s)) {} #endif QJsonValue(const QJsonArray &a); |