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/qquickparticlepainter_p.h b/src/particles/qquickparticlepainter_p.h
index 7801fddb6e..cedf4cab52 100644
--- a/src/particles/qquickparticlepainter_p.h
+++ b/src/particles/qquickparticlepainter_p.h
@@ -76,13 +76,13 @@ public:
 
     void itemChange(ItemChange, const ItemChangeData &);
 
-signals:
+Q_SIGNALS:
     void countChanged();
     void systemChanged(QQuickParticleSystem* arg);
 
     void groupsChanged(QStringList arg);
 
-public slots:
+public Q_SLOTS:
     void setSystem(QQuickParticleSystem* arg);
 
     void setGroups(QStringList arg)
@@ -90,13 +90,13 @@ public slots:
         if (m_groups != arg) {
             m_groups = arg;
             //Note: The system watches this as it has to recalc things when groups change. It will request a reset if necessary
-            emit groupsChanged(arg);
+            Q_EMIT groupsChanged(arg);
         }
     }
 
     void calcSystemOffset(bool resetPending = false);
 
-private slots:
+private Q_SLOTS:
     virtual void sceneGraphInvalidated() {}
 
 protected: