From 1ae15edd7e7ec4bd96d3a9a4d6b5793c7f7e8830 Mon Sep 17 00:00:00 2001
From: Andrei Golubev <andrei.golubev@qt.io>
Date: Tue, 13 Oct 2020 16:50:11 +0200
Subject: [PATCH] Remove nodiscard in QPropertyObserverNodeProtector ctor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/corelib/kernel/qproperty.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/corelib/kernel/qproperty.cpp b/src/corelib/kernel/qproperty.cpp
index 3c4a48ed37e..3ef37528d5a 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 ||