summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel
diff options
context:
space:
mode:
authorAndrei Golubev <andrei.golubev@qt.io>2020-10-13 16:50:11 +0200
committerAndrei Golubev <andrei.golubev@qt.io>2020-10-13 17:00:23 +0200
commit1ae15edd7e7ec4bd96d3a9a4d6b5793c7f7e8830 (patch)
tree0ac795a9da8e49c93f832e14490dab6eded7596c /src/corelib/kernel
parent705837771cf08177b10206c0a53752611804a4b0 (diff)
Remove nodiscard in QPropertyObserverNodeProtector ctor
Produced error in my GCC 7.5 on Ubuntu 18: error: ‘nodiscard’ attribute applied to ‘QPropertyObserverNodeProtector<<anonymous> >::QPropertyObserverNodeProtector(QPropertyObserver*&)’ with void return type [-Werror=attributes] Q_REQUIRED_RESULT QPropertyObserverNodeProtector(QPropertyObserver *&observer) Change-Id: Ic1f6c4f502bb4d5c764686d5521b92f655592bb2 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r--src/corelib/kernel/qproperty.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qproperty.cpp b/src/corelib/kernel/qproperty.cpp
index 3c4a48ed37..3ef37528d5 100644
--- a/src/corelib/kernel/qproperty.cpp
+++ b/src/corelib/kernel/qproperty.cpp
@@ -461,7 +461,7 @@ struct [[nodiscard]] QPropertyObserverNodeProtector {
QPropertyBindingPrivate *m_binding;
QPropertyObserver::ChangeHandler m_changeHandler;
};
- Q_REQUIRED_RESULT QPropertyObserverNodeProtector(QPropertyObserver *&observer)
+ QPropertyObserverNodeProtector(QPropertyObserver *&observer)
: m_observer(observer)
{
static_assert(tag == QPropertyObserver::ObserverNotifiesBinding ||