aboutsummaryrefslogtreecommitdiffstats
path: root/src/particles/qquickparticlepainter.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/particles/qquickparticlepainter.cpp')
-rw-r--r--src/particles/qquickparticlepainter.cpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/particles/qquickparticlepainter.cpp b/src/particles/qquickparticlepainter.cpp
index bb67611004..ee5942d7fd 100644
--- a/src/particles/qquickparticlepainter.cpp
+++ b/src/particles/qquickparticlepainter.cpp
@@ -1,6 +1,8 @@
// Copyright (C) 2016 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses
+
#include "qquickparticlepainter_p.h"
#include <QQuickWindow>
#include <QDebug>
@@ -42,12 +44,16 @@ QQuickParticlePainter::QQuickParticlePainter(QQuickItem *parent)
void QQuickParticlePainter::itemChange(ItemChange change, const ItemChangeData &data)
{
if (change == QQuickItem::ItemSceneChange) {
- if (m_window)
- disconnect(m_window, SIGNAL(sceneGraphInvalidated()), this, SLOT(sceneGraphInvalidated()));
+ if (m_window) {
+ disconnect(m_window, &QQuickWindow::sceneGraphInvalidated,
+ this, &QQuickParticlePainter::sceneGraphInvalidated);
+ }
m_window = data.window;
m_windowChanged = true;
- if (m_window)
- connect(m_window, SIGNAL(sceneGraphInvalidated()), this, SLOT(sceneGraphInvalidated()), Qt::DirectConnection);
+ if (m_window) {
+ connect(m_window, &QQuickWindow::sceneGraphInvalidated,
+ this, &QQuickParticlePainter::sceneGraphInvalidated, Qt::DirectConnection);
+ }
}
QQuickItem::itemChange(change, data);
}