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, 8 insertions, 8 deletions

diff --git a/src/particles/qquicktrailemitter_p.h b/src/particles/qquicktrailemitter_p.h
index 54041f1751..f3f6884417 100644
--- a/src/particles/qquicktrailemitter_p.h
+++ b/src/particles/qquicktrailemitter_p.h
@@ -90,7 +90,7 @@ public:
         return m_emissionExtruder;
     }
 
-signals:
+Q_SIGNALS:
     void emitFollowParticles(QQmlV4Handle particles, QQmlV4Handle followed);
 
     void particlesPerParticlePerSecondChanged(int arg);
@@ -103,20 +103,20 @@ signals:
 
     void emissionShapeChanged(QQuickParticleExtruder* arg);
 
-public slots:
+public Q_SLOTS:
 
     void setParticlesPerParticlePerSecond(int arg)
     {
         if (m_particlesPerParticlePerSecond != arg) {
             m_particlesPerParticlePerSecond = arg;
-            emit particlesPerParticlePerSecondChanged(arg);
+            Q_EMIT particlesPerParticlePerSecondChanged(arg);
         }
     }
     void setEmitterXVariation(qreal arg)
     {
         if (m_emitterXVariation != arg) {
             m_emitterXVariation = arg;
-            emit emitterXVariationChanged(arg);
+            Q_EMIT emitterXVariationChanged(arg);
         }
     }
 
@@ -124,7 +124,7 @@ public slots:
     {
         if (m_emitterYVariation != arg) {
             m_emitterYVariation = arg;
-            emit emitterYVariationChanged(arg);
+            Q_EMIT emitterYVariationChanged(arg);
         }
     }
 
@@ -132,7 +132,7 @@ public slots:
     {
         if (m_follow != arg) {
             m_follow = arg;
-            emit followChanged(arg);
+            Q_EMIT followChanged(arg);
         }
     }
 
@@ -140,11 +140,11 @@ public slots:
     {
         if (m_emissionExtruder != arg) {
             m_emissionExtruder = arg;
-            emit emissionShapeChanged(arg);
+            Q_EMIT emissionShapeChanged(arg);
         }
     }
 
-private slots:
+private Q_SLOTS:
     void recalcParticlesPerSecond();
 
 private: