diff options
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.cpp | 3 | ||||
| -rw-r--r-- | src/qml/qml/qqmlpropertycache_p.h | 6 | ||||
| -rw-r--r-- | src/quicktemplates/qquickdeferredpointer_p_p.h | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.cpp b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.cpp index 7601c59cac..84019826e4 100644 --- a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.cpp +++ b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.cpp @@ -23,7 +23,8 @@ struct QuitLockDisabler { const bool quitLockEnabled; - QuitLockDisabler() : quitLockEnabled(QCoreApplication::isQuitLockEnabled()) + Q_NODISCARD_CTOR QuitLockDisabler() + : quitLockEnabled(QCoreApplication::isQuitLockEnabled()) { QCoreApplication::setQuitLockEnabled(false); } diff --git a/src/qml/qml/qqmlpropertycache_p.h b/src/qml/qml/qqmlpropertycache_p.h index b261d1caca..a06a1b6e39 100644 --- a/src/qml/qml/qqmlpropertycache_p.h +++ b/src/qml/qml/qqmlpropertycache_p.h @@ -40,9 +40,9 @@ class QQmlVMEMetaObject; class QQmlMetaObjectPointer { public: - QQmlMetaObjectPointer() = default; + Q_NODISCARD_CTOR QQmlMetaObjectPointer() = default; - QQmlMetaObjectPointer(const QMetaObject *staticMetaObject) + Q_NODISCARD_CTOR QQmlMetaObjectPointer(const QMetaObject *staticMetaObject) : d(quintptr(staticMetaObject)) { Q_ASSERT((d.loadRelaxed() & Shared) == 0); @@ -57,7 +57,7 @@ public: private: friend class QQmlPropertyCache; - QQmlMetaObjectPointer(const QQmlMetaObjectPointer &other) + Q_NODISCARD_CTOR QQmlMetaObjectPointer(const QQmlMetaObjectPointer &other) : d(other.d.loadRelaxed()) { // other has to survive until this ctor is done. So d cannot disappear before. diff --git a/src/quicktemplates/qquickdeferredpointer_p_p.h b/src/quicktemplates/qquickdeferredpointer_p_p.h index cd5a87e508..e1fa85e2ee 100644 --- a/src/quicktemplates/qquickdeferredpointer_p_p.h +++ b/src/quicktemplates/qquickdeferredpointer_p_p.h @@ -113,10 +113,10 @@ class QQuickDeferredPointer : public QQuickUntypedDeferredPointer { Q_DISABLE_COPY_MOVE(QQuickDeferredPointer) public: - QQuickDeferredPointer() = default; + Q_NODISCARD_CTOR QQuickDeferredPointer() = default; ~QQuickDeferredPointer() = default; - QQuickDeferredPointer(T *v) : QQuickUntypedDeferredPointer(v) {} + Q_NODISCARD_CTOR QQuickDeferredPointer(T *v) : QQuickUntypedDeferredPointer(v) {} QQuickDeferredPointer<T> &operator=(T *o) { QQuickUntypedDeferredPointer::operator=(o); return *this; |