1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove nodiscard in QPropertyObserverNodeProtector ctor

Browse Source 
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>
This commit is contained in:
Andrei Golubev 2020-10-13 16:50:11 +02:00
parent 705837771c
commit 1ae15edd7e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/kernel/qproperty.cpp
View File

@ -461,7 +461,7 @@ struct [[nodiscard]] QPropertyObserverNodeProtector {
QPropertyBindingPrivate *m_binding; QPropertyBindingPrivate *m_binding;
QPropertyObserver::ChangeHandler m_changeHandler; QPropertyObserver::ChangeHandler m_changeHandler;
}; };
Q_REQUIRED_RESULT QPropertyObserverNodeProtector(QPropertyObserver *&observer) QPropertyObserverNodeProtector(QPropertyObserver *&observer)
: m_observer(observer) : m_observer(observer)
{ {
static_assert(tag == QPropertyObserver::ObserverNotifiesBinding || static_assert(tag == QPropertyObserver::ObserverNotifiesBinding ||