diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-08-13 09:46:17 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-08-13 09:46:17 +0200 |
| commit | 1dade1bd8ad13a16152aff36351ac570b5b9fdf6 (patch) | |
| tree | eafed5710b34c327a98381ca15fe1985a6487b10 /src/corelib/serialization | |
| parent | d45908e24292a41ff7838366b34be7340bf9fda5 (diff) | |
| parent | fb703aea697b12de4810deec9f8605fd062208bd (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
mkspecs/win32-clang-msvc/qmake.conf
src/corelib/tools/qlist.h
src/gui/painting/qcompositionfunctions.cpp
src/gui/painting/qtriangulator_p.h
src/gui/text/qfontengine_p.h
src/network/kernel/qhostinfo_p.h
src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
Done-With: Allan Sandfeld Jensen <allan.jensen@qt.io>
Change-Id: Ib8a0308cf77224c4fbdcf56778fdac4a43e37798
Diffstat (limited to 'src/corelib/serialization')
| -rw-r--r-- | src/corelib/serialization/qjsonvalue.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/serialization/qjsonvalue.h b/src/corelib/serialization/qjsonvalue.h index 430fa06c0f..8ade18509b 100644 --- a/src/corelib/serialization/qjsonvalue.h +++ b/src/corelib/serialization/qjsonvalue.h @@ -177,9 +177,9 @@ class Q_CORE_EXPORT QJsonValueRef { public: QJsonValueRef(QJsonArray *array, int idx) - : a(array), is_object(false), index(idx) {} + : a(array), is_object(false), index(static_cast<uint>(idx)) {} QJsonValueRef(QJsonObject *object, int idx) - : o(object), is_object(true), index(idx) {} + : o(object), is_object(true), index(static_cast<uint>(idx)) {} inline operator QJsonValue() const { return toValue(); } QJsonValueRef &operator = (const QJsonValue &val); |