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/qquickspritegoal_p.h b/src/particles/qquickspritegoal_p.h
index 4d5f192f0a..c5c7539b58 100644
--- a/src/particles/qquickspritegoal_p.h
+++ b/src/particles/qquickspritegoal_p.h
@@ -73,7 +73,7 @@ public:
 
 protected:
     virtual bool affectParticle(QQuickParticleData *d, qreal dt);
-signals:
+Q_SIGNALS:
 
     void goalStateChanged(QString arg);
 
@@ -81,7 +81,7 @@ signals:
 
     void systemStatesChanged(bool arg);
 
-public slots:
+public Q_SLOTS:
 
 void setGoalState(QString arg);
 
@@ -89,7 +89,7 @@ void setJump(bool arg)
 {
     if (m_jump != arg) {
         m_jump = arg;
-        emit jumpChanged(arg);
+        Q_EMIT jumpChanged(arg);
     }
 }
 
@@ -99,7 +99,7 @@ void setSystemStates(bool arg)
         //TODO: GroupGoal was added (and this deprecated) Oct 4 - remove it in a few weeks.
         qmlInfo(this) << "systemStates is deprecated and will be removed soon. Use GroupGoal instead.";
         m_systemStates = arg;
-        emit systemStatesChanged(arg);
+        Q_EMIT systemStatesChanged(arg);
     }
 }