Allow QtQuick private headers to be used with QT_NO_KEYWORDS.

This is necessary for the QtWebEngine module.

This also adds an empty nokeywords test using the same mechanism
as qtbase/tests/auto/tools/moc/no-keywords.h to find conflicts
at compile time.

Change-Id: I9df541720797dd61f078178c2af68ead18ff8bfe
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/src/particles/qquickparticleaffector_p.h b/src/particles/qquickparticleaffector_p.h
index 2629ecc676..5ee8430472 100644
--- a/src/particles/qquickparticleaffector_p.h
+++ b/src/particles/qquickparticleaffector_p.h
@@ -92,7 +92,7 @@ public:
         return m_whenCollidingWith;
     }
 
-signals:
+Q_SIGNALS:
 
     void systemChanged(QQuickParticleSystem* arg);
 
@@ -108,13 +108,13 @@ signals:
 
     void whenCollidingWithChanged(QStringList arg);
 
-public slots:
+public Q_SLOTS:
 void setSystem(QQuickParticleSystem* arg)
 {
     if (m_system != arg) {
         m_system = arg;
         m_system->registerParticleAffector(this);
-        emit systemChanged(arg);
+        Q_EMIT systemChanged(arg);
     }
 }
 
@@ -123,7 +123,7 @@ void setGroups(QStringList arg)
     if (m_groups != arg) {
         m_groups = arg;
         m_updateIntSet = true;
-        emit groupsChanged(arg);
+        Q_EMIT groupsChanged(arg);
     }
 }
 
@@ -131,7 +131,7 @@ void setEnabled(bool arg)
 {
     if (m_enabled != arg) {
         m_enabled = arg;
-        emit enabledChanged(arg);
+        Q_EMIT enabledChanged(arg);
     }
 }
 
@@ -140,7 +140,7 @@ void setOnceOff(bool arg)
     if (m_onceOff != arg) {
         m_onceOff = arg;
         m_needsReset = true;
-        emit onceChanged(arg);
+        Q_EMIT onceChanged(arg);
     }
 }
 
@@ -148,7 +148,7 @@ void setShape(QQuickParticleExtruder* arg)
 {
     if (m_shape != arg) {
         m_shape = arg;
-        emit shapeChanged(arg);
+        Q_EMIT shapeChanged(arg);
     }
 }
 
@@ -156,10 +156,10 @@ void setWhenCollidingWith(QStringList arg)
 {
     if (m_whenCollidingWith != arg) {
         m_whenCollidingWith = arg;
-        emit whenCollidingWithChanged(arg);
+        Q_EMIT whenCollidingWithChanged(arg);
     }
 }
-public slots:
+public Q_SLOTS:
     void updateOffsets();
 
 protected: