diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-01-09 20:30:39 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-01-09 20:30:39 +0100 |
| commit | a59c7684897bfbbb7ddcec2f05263fee92ab5056 (patch) | |
| tree | 50793671569f87bdbfc0e9ff36adbf416971d6cf /src/corelib/serialization | |
| parent | 5507d0f1b04ea6b1d91be9ade30bc31d1830c220 (diff) | |
| parent | 1c75f59588694557caba69c2fc173dd8f1d7f514 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/corelib/kernel/qobject.cpp
Change-Id: I4780b25665672692b086ee92092e506c814642f2
Diffstat (limited to 'src/corelib/serialization')
| -rw-r--r-- | src/corelib/serialization/qcborvalue.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/serialization/qcborvalue.h b/src/corelib/serialization/qcborvalue.h index 1df8425d45..f7064ac6e1 100644 --- a/src/corelib/serialization/qcborvalue.h +++ b/src/corelib/serialization/qcborvalue.h @@ -332,9 +332,9 @@ private: return Type(quint8(st) | SimpleType); } - Q_DECL_CONSTEXPR static bool isTag_helper(Type t) + Q_DECL_CONSTEXPR static bool isTag_helper(Type tt) { - return t == Tag || t >= 0x10000; + return tt == Tag || tt >= 0x10000; } }; Q_DECLARE_SHARED(QCborValue) |