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

diff --git a/src/particles/qquickpointattractor_p.h b/src/particles/qquickpointattractor_p.h
index 1332591daf..6747798364 100644
--- a/src/particles/qquickpointattractor_p.h
+++ b/src/particles/qquickpointattractor_p.h
@@ -98,7 +98,7 @@ public:
         return m_proportionalToDistance;
     }
 
-signals:
+Q_SIGNALS:
 
     void strengthChanged(qreal arg);
 
@@ -110,12 +110,12 @@ signals:
 
     void proportionalToDistanceChanged(Proportion arg);
 
-public slots:
+public Q_SLOTS:
 void setStrength(qreal arg)
 {
     if (m_strength != arg) {
         m_strength = arg;
-        emit strengthChanged(arg);
+        Q_EMIT strengthChanged(arg);
     }
 }
 
@@ -123,7 +123,7 @@ void setPointX(qreal arg)
 {
     if (m_x != arg) {
         m_x = arg;
-        emit pointXChanged(arg);
+        Q_EMIT pointXChanged(arg);
     }
 }
 
@@ -131,14 +131,14 @@ void setPointY(qreal arg)
 {
     if (m_y != arg) {
         m_y = arg;
-        emit pointYChanged(arg);
+        Q_EMIT pointYChanged(arg);
     }
 }
 void setAffectedParameter(AffectableParameters arg)
 {
     if (m_physics != arg) {
         m_physics = arg;
-        emit affectedParameterChanged(arg);
+        Q_EMIT affectedParameterChanged(arg);
     }
 }
 
@@ -146,7 +146,7 @@ void setProportionalToDistance(Proportion arg)
 {
     if (m_proportionalToDistance != arg) {
         m_proportionalToDistance = arg;
-        emit proportionalToDistanceChanged(arg);
+        Q_EMIT proportionalToDistanceChanged(arg);
     }
 }