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>

6 files changed, 7 insertions, 7 deletions

diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h b/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
index 1aa165281a..6e9bd750e2 100644
--- a/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
+++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
@@ -373,7 +373,7 @@ public:
         qDeleteAll(stockShaders.values());
     }
 
-public slots:
+public Q_SLOTS:
     void invalidated();
 
 public:
diff --git a/src/quick/scenegraph/coreapi/qsgrenderer_p.h b/src/quick/scenegraph/coreapi/qsgrenderer_p.h
index 0370be000b..3479c4392c 100644
--- a/src/quick/scenegraph/coreapi/qsgrenderer_p.h
+++ b/src/quick/scenegraph/coreapi/qsgrenderer_p.h
@@ -134,7 +134,7 @@ public:
     void setClearMode(ClearMode mode) { m_clear_mode = mode; }
     ClearMode clearMode() const { return m_clear_mode; }
 
-signals:
+Q_SIGNALS:
     void sceneGraphChanged(); // Add, remove, ChangeFlags changes...
 
 protected:
diff --git a/src/quick/scenegraph/qsgcontext_p.h b/src/quick/scenegraph/qsgcontext_p.h
index 3d5fc00de3..b5d8ca05ae 100644
--- a/src/quick/scenegraph/qsgcontext_p.h
+++ b/src/quick/scenegraph/qsgcontext_p.h
@@ -130,10 +130,10 @@ public:
     static QSGRenderLoop *createWindowManager();
 
 
-public slots:
+public Q_SLOTS:
     void textureFactoryDestroyed(QObject *o);
 
-signals:
+Q_SIGNALS:
     void initialized();
     void invalidated();
 };
diff --git a/src/quick/scenegraph/qsgrenderloop_p.h b/src/quick/scenegraph/qsgrenderloop_p.h
index 6ff9c4c5f9..1e9a645cf4 100644
--- a/src/quick/scenegraph/qsgrenderloop_p.h
+++ b/src/quick/scenegraph/qsgrenderloop_p.h
@@ -81,7 +81,7 @@ public:
 
     virtual bool interleaveIncubation() const { return false; }
 
-signals:
+Q_SIGNALS:
     void timeToIncubate();
 
 private:
diff --git a/src/quick/scenegraph/qsgthreadedrenderloop_p.h b/src/quick/scenegraph/qsgthreadedrenderloop_p.h
index 6ff5cabf43..f1e75f6869 100644
--- a/src/quick/scenegraph/qsgthreadedrenderloop_p.h
+++ b/src/quick/scenegraph/qsgthreadedrenderloop_p.h
@@ -81,7 +81,7 @@ public:
 
     bool interleaveIncubation() const;
 
-public slots:
+public Q_SLOTS:
     void animationStarted();
     void animationStopped();
 
diff --git a/src/quick/scenegraph/qsgwindowsrenderloop_p.h b/src/quick/scenegraph/qsgwindowsrenderloop_p.h
index 218e18c3e2..82eeb423e8 100644
--- a/src/quick/scenegraph/qsgwindowsrenderloop_p.h
+++ b/src/quick/scenegraph/qsgwindowsrenderloop_p.h
@@ -84,7 +84,7 @@ public:
 
     bool interleaveIncubation() const;
 
-public slots:
+public Q_SLOTS:
     void started();
     void stopped();