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

diff --git a/src/particles/qquickgravity_p.h b/src/particles/qquickgravity_p.h
index e6010b536e..d4c3ef4ac2 100644
--- a/src/particles/qquickgravity_p.h
+++ b/src/particles/qquickgravity_p.h
@@ -64,20 +64,20 @@ public:
     }
 protected:
     virtual bool affectParticle(QQuickParticleData *d, qreal dt);
-signals:
+Q_SIGNALS:
 
     void magnitudeChanged(qreal arg);
 
     void angleChanged(qreal arg);
 
-public slots:
+public Q_SLOTS:
 void setAcceleration(qreal arg)
 {
     qWarning() << "Gravity::acceleration has been renamed Gravity::magnitude";
     if (m_magnitude != arg) {
         m_magnitude = arg;
         m_needRecalc = true;
-        emit magnitudeChanged(arg);
+        Q_EMIT magnitudeChanged(arg);
     }
 }
 
@@ -86,7 +86,7 @@ void setMagnitude(qreal arg)
     if (m_magnitude != arg) {
         m_magnitude = arg;
         m_needRecalc = true;
-        emit magnitudeChanged(arg);
+        Q_EMIT magnitudeChanged(arg);
     }
 }
 
@@ -95,7 +95,7 @@ void setAngle(qreal arg)
     if (m_angle != arg) {
         m_angle = arg;
         m_needRecalc = true;
-        emit angleChanged(arg);
+        Q_EMIT angleChanged(arg);
     }
 }