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

diff --git a/src/particles/qquickparticlegroup_p.h b/src/particles/qquickparticlegroup_p.h
index bbac8aab0d..f7bccf99ac 100644
--- a/src/particles/qquickparticlegroup_p.h
+++ b/src/particles/qquickparticlegroup_p.h
@@ -74,13 +74,13 @@ public:
         return m_system;
     }
 
-public slots:
+public Q_SLOTS:
 
     void setMaximumAlive(int arg)
     {
         if (m_maximumAlive != arg) {
             m_maximumAlive = arg;
-            emit maximumAliveChanged(arg);
+            Q_EMIT maximumAliveChanged(arg);
         }
     }
 
@@ -88,7 +88,7 @@ public slots:
 
     void delayRedirect(QObject* obj);
 
-signals:
+Q_SIGNALS:
 
     void maximumAliveChanged(int arg);