diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-01 01:00:23 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-03 14:13:53 +0100 |
commit | 2f2d870fdd1e99d27fda6fa986f7de8a17ad0edf (patch) | |
tree | 00c1ec03ae3e2a1f3971543dc975598a36cc12c6 /src/corelib/kernel/qmetatype.cpp | |
parent | bbe71efc23334ae928b887555d9cdee30fa826e3 (diff) | |
parent | 63312fe2ec1c1d8c0efabc02e3af8e5b47ca320e (diff) |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'src/corelib/kernel/qmetatype.cpp')
-rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index da4d98955d..c81f958e74 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -718,7 +718,7 @@ QMetaType &QMetaType::operator=(const QMetaType &other) \relates QMetaType \overload - Returns \c true if the QMetaType \a a represents a difference type + Returns \c true if the QMetaType \a a represents a different type than the QMetaType \a b, otherwise returns \c false. */ @@ -1750,7 +1750,7 @@ static QtPrivate::QMetaTypeInterface *interfaceForType(int typeId) Constructs a QMetaType object that contains all information about type \a typeId. - \note: The default parameter was added in Qt 5.15 + \note The default parameter was added in Qt 5.15. */ QMetaType::QMetaType(int typeId) : QMetaType(interfaceForType(typeId)) {} |