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

diff --git a/src/quick/items/qquickspriteengine_p.h b/src/quick/items/qquickspriteengine_p.h
index 768b5e4a6e..3ff5f8caee 100644
--- a/src/quick/items/qquickspriteengine_p.h
+++ b/src/quick/items/qquickspriteengine_p.h
@@ -108,7 +108,7 @@ public:
         return m_randomStart;
     }
 
-signals:
+Q_SIGNALS:
     void durationChanged(int arg);
 
     void nameChanged(QString arg);
@@ -121,12 +121,12 @@ signals:
 
     void randomStartChanged(bool arg);
 
-public slots:
+public Q_SLOTS:
     void setDuration(int arg)
     {
         if (m_duration != arg) {
             m_duration = arg;
-            emit durationChanged(arg);
+            Q_EMIT durationChanged(arg);
         }
     }
 
@@ -134,7 +134,7 @@ public slots:
     {
         if (m_name != arg) {
             m_name = arg;
-            emit nameChanged(arg);
+            Q_EMIT nameChanged(arg);
         }
     }
 
@@ -142,7 +142,7 @@ public slots:
     {
         if (m_to != arg) {
             m_to = arg;
-            emit toChanged(arg);
+            Q_EMIT toChanged(arg);
         }
     }
 
@@ -150,7 +150,7 @@ public slots:
     {
         if (m_durationVariation != arg) {
             m_durationVariation = arg;
-            emit durationVariationChanged(arg);
+            Q_EMIT durationVariationChanged(arg);
         }
     }
 
@@ -158,7 +158,7 @@ public slots:
     {
         if (m_randomStart != arg) {
             m_randomStart = arg;
-            emit randomStartChanged(arg);
+            Q_EMIT randomStartChanged(arg);
         }
     }
 
@@ -214,17 +214,17 @@ public:
 
     int stateCount() {return m_states.count();}
 private:
-signals:
+Q_SIGNALS:
 
     void globalGoalChanged(QString arg);
     void stateChanged(int idx);
 
-public slots:
+public Q_SLOTS:
     void setGlobalGoal(QString arg)
     {
         if (m_globalGoal != arg) {
             m_globalGoal = arg;
-            emit globalGoalChanged(arg);
+            Q_EMIT globalGoalChanged(arg);
         }
     }