From d22ea28589767189cb0e38fc68bf5d7f308d0417 Mon Sep 17 00:00:00 2001 From: Fabian Kosmale Date: Wed, 21 Oct 2020 08:54:22 +0200 Subject: QQuickWindow: Change 0 to nullptr for removeAll MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The change in qtbase which made removeAll had the unfortunate side effect that were deducing type int now (instead of converting 0 to the null pointer constant), which -after a few indirections- leads to 3365: src/quick/items/qquickwindow.cpp:3785:22: required from here /usr/include/c++/10/bits/predefined_ops.h:268:17: error: ↩ ISO C++ forbids comparison between pointer and integer [-fpermissive] 268 | { return *__it == _M_value; } | ~~~~~~^~~~~~~~~~~ Change-Id: I2ba7c561a2431a8a71f77068daef60d5ae62f17c Reviewed-by: Volker Hilsheimer --- src/quick/items/qquickwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 10a13cd134..5011564fa5 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -3782,7 +3782,7 @@ void QQuickWindowPrivate::updateDirtyNode(QQuickItem *item) << itemPriv->clipNode() << itemPriv->rootNode() << itemPriv->paintNode; - nodes.removeAll(0); + nodes.removeAll(nullptr); Q_ASSERT(nodes.constFirst() == itemPriv->itemNodeInstance); for (int i=1; i