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/quick/items/qquickspritesequence_p.h b/src/quick/items/qquickspritesequence_p.h
index b954a4464f..8f5a992942 100644
--- a/src/quick/items/qquickspritesequence_p.h
+++ b/src/quick/items/qquickspritesequence_p.h
@@ -88,14 +88,14 @@ public:
         return m_curState;
     }
 
-signals:
+Q_SIGNALS:
 
     void runningChanged(bool arg);
     void interpolateChanged(bool arg);
     void goalSpriteChanged(QString arg);
     void currentSpriteChanged(QString arg);
 
-public slots:
+public Q_SLOTS:
 
     void jumpTo(const QString &sprite);
     void setGoalSprite(const QString &sprite);
@@ -104,7 +104,7 @@ public slots:
     {
         if (m_running != arg) {
             m_running = arg;
-            emit runningChanged(arg);
+            Q_EMIT runningChanged(arg);
         }
     }
 
@@ -112,11 +112,11 @@ public slots:
     {
         if (m_interpolate != arg) {
             m_interpolate = arg;
-            emit interpolateChanged(arg);
+            Q_EMIT interpolateChanged(arg);
         }
     }
 
-private slots:
+private Q_SLOTS:
     void createEngine();
     void sizeVertices();