diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-11 01:00:06 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-11 01:00:06 +0100 |
commit | 0a02de62d1fe4341684df370242fd3aca3b21f9d (patch) | |
tree | 393119de339401ac829a2ae27efae019f4541bdf /src/corelib | |
parent | fbc9fb233dfb1959924632b428048d5f6a3401d9 (diff) | |
parent | c7f6761bc98593744f8f8f9d2b864656f8d36a58 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Iecdf00ca61d819bde532daa42f093860ec4a499e
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/doc/snippets/code/src_corelib_tools_qscopeguard.cpp | 2 | ||||
-rw-r--r-- | src/corelib/serialization/qcborstream.cpp | 2 | ||||
-rw-r--r-- | src/corelib/tools/qscopeguard.qdoc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qscopeguard.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qscopeguard.cpp index c8c5f694c6..2fa4f88011 100644 --- a/src/corelib/doc/snippets/code/src_corelib_tools_qscopeguard.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_tools_qscopeguard.cpp @@ -57,7 +57,7 @@ void myComplexCodeWithMultipleReturnPoints(int v) if (v == -1) return; - int v2 = code_that_might_through_exceptions(); + int v2 = code_that_might_throw_exceptions(); if (v2 == -1) return; diff --git a/src/corelib/serialization/qcborstream.cpp b/src/corelib/serialization/qcborstream.cpp index 546f9ffe57..e222bf5514 100644 --- a/src/corelib/serialization/qcborstream.cpp +++ b/src/corelib/serialization/qcborstream.cpp @@ -1950,7 +1950,7 @@ inline void QCborStreamReader::preparse() // for negative integer and we don't have separate types for Boolean, // Null and Undefined). if (type_ == CborBooleanType || type_ == CborNullType || type_ == CborUndefinedType) { - type_ = SimpleType; + type_ = CborSimpleType; value64 = quint8(d->buffer.at(d->bufferStart)) - CborSimpleType; } else { // Using internal TinyCBOR API! diff --git a/src/corelib/tools/qscopeguard.qdoc b/src/corelib/tools/qscopeguard.qdoc index 70e13ab2fd..21b0bab9cf 100644 --- a/src/corelib/tools/qscopeguard.qdoc +++ b/src/corelib/tools/qscopeguard.qdoc @@ -33,7 +33,7 @@ QT_BEGIN_NAMESPACE \class QScopeGuard \since 5.12 \inmodule QtCore - \brief Provides a scope guard for calling a function at the of + \brief Provides a scope guard for calling a function at the end of a scope. */ |