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

diff --git a/src/particles/qquickpointdirection_p.h b/src/particles/qquickpointdirection_p.h
index eae385a3b7..e4c8624c9c 100644
--- a/src/particles/qquickpointdirection_p.h
+++ b/src/particles/qquickpointdirection_p.h
@@ -75,7 +75,7 @@ public:
         return m_yVariation;
     }
 
-signals:
+Q_SIGNALS:
 
     void xChanged(qreal arg);
 
@@ -85,12 +85,12 @@ signals:
 
     void yVariationChanged(qreal arg);
 
-public slots:
+public Q_SLOTS:
     void setX(qreal arg)
     {
         if (m_x != arg) {
             m_x = arg;
-            emit xChanged(arg);
+            Q_EMIT xChanged(arg);
         }
     }
 
@@ -98,7 +98,7 @@ public slots:
     {
         if (m_y != arg) {
             m_y = arg;
-            emit yChanged(arg);
+            Q_EMIT yChanged(arg);
         }
     }
 
@@ -106,7 +106,7 @@ public slots:
     {
         if (m_xVariation != arg) {
             m_xVariation = arg;
-            emit xVariationChanged(arg);
+            Q_EMIT xVariationChanged(arg);
         }
     }
 
@@ -114,7 +114,7 @@ public slots:
     {
         if (m_yVariation != arg) {
             m_yVariation = arg;
-            emit yVariationChanged(arg);
+            Q_EMIT yVariationChanged(arg);
         }
     }