From 0f272af5c8f36166bdcd519001e3af83e4e28599 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 8 Aug 2023 10:11:19 +0200 Subject: [PATCH] embeddedintoforeignindow test: port itemwindow.h away from Q_FOREACH As a header, it would otherwise make all TUs that include it (with PCH: all) incompatible with QT_NO_FOREACH. Without deeper analysis (which economy of time forbids in this case, given this is just a manual test that's probably run 10 times per year), and seeing as this is in an event handler, I opted to play it safe and iterate over a copy (which is exactly what Q_FOREACH does). Added a comment to indicate it may not be needed. Task-number: QTBUG-115839 Change-Id: I7db75321dd34888f6dd7a64cccb7462ff35935fa Reviewed-by: Ahmad Samir Reviewed-by: Richard Moe Gustavsen (cherry picked from commit cc15e42e2c14ac40339620035b77d3f82f5480d0) Reviewed-by: Qt Cherry-pick Bot --- tests/manual/embeddedintoforeignwindow/itemwindow.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/manual/embeddedintoforeignwindow/itemwindow.h b/tests/manual/embeddedintoforeignwindow/itemwindow.h index a0e11ae1c0b..80546520741 100644 --- a/tests/manual/embeddedintoforeignwindow/itemwindow.h +++ b/tests/manual/embeddedintoforeignwindow/itemwindow.h @@ -65,7 +65,8 @@ private: #define PROPAGATE_EVENT(windowHandler, eventClass, itemHandler) \ void windowHandler(eventClass *e) override \ { \ - foreach (Item *i, m_items) \ + const auto copy = m_items; /* needed? */ \ + for (Item *i : copy) \ i->itemHandler(e); \ }