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

diff --git a/src/particles/qquickage_p.h b/src/particles/qquickage_p.h
index 0839517e95..4bca34ce0f 100644
--- a/src/particles/qquickage_p.h
+++ b/src/particles/qquickage_p.h
@@ -66,16 +66,16 @@ public:
 
 protected:
     virtual bool affectParticle(QQuickParticleData *d, qreal dt);
-signals:
+Q_SIGNALS:
     void lifeLeftChanged(int arg);
     void advancePositionChanged(bool arg);
 
-public slots:
+public Q_SLOTS:
     void setLifeLeft(int arg)
     {
         if (m_lifeLeft != arg) {
             m_lifeLeft = arg;
-            emit lifeLeftChanged(arg);
+            Q_EMIT lifeLeftChanged(arg);
         }
     }
 
@@ -83,7 +83,7 @@ public slots:
     {
         if (m_advancePosition != arg) {
             m_advancePosition = arg;
-            emit advancePositionChanged(arg);
+            Q_EMIT advancePositionChanged(arg);
         }
     }