summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabian Kosmale <fabian.kosmale@qt.io>2020-10-21 08:54:22 +0200
committerFabian Kosmale <fabian.kosmale@qt.io>2020-10-21 09:01:04 +0200
commitd22ea28589767189cb0e38fc68bf5d7f308d0417 (patch)
treea38efd6af651058122e90cc0ae15bf3ec4972e98
parente62f97f5f824436ebc178f5bf332d5b9b08ee118 (diff)
QQuickWindow: Change 0 to nullptr for removeAllv6.0.0-beta2
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 <volker.hilsheimer@qt.io>
-rw-r--r--src/quick/items/qquickwindow.cpp2
1 files changed, 1 insertions, 1 deletions
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<nodes.size(); ++i) {