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>

26 files changed, 130 insertions, 130 deletions

diff --git a/src/particles/qquickage_p.h b/src/particles/qquickage_p.h
index 0839517e95..4bca34ce0f 100644
--- a/src/particles/qquickage_p.h
+++ b/src/particles/qquickage_p.h
@@ -66,16 +66,16 @@ public:
 
 protected:
     virtual bool affectParticle(QQuickParticleData *d, qreal dt);
-signals:
+Q_SIGNALS:
     void lifeLeftChanged(int arg);
     void advancePositionChanged(bool arg);
 
-public slots:
+public Q_SLOTS:
     void setLifeLeft(int arg)
     {
         if (m_lifeLeft != arg) {
             m_lifeLeft = arg;
-            emit lifeLeftChanged(arg);
+            Q_EMIT lifeLeftChanged(arg);
         }
     }
 
@@ -83,7 +83,7 @@ public slots:
     {
         if (m_advancePosition != arg) {
             m_advancePosition = arg;
-            emit advancePositionChanged(arg);
+            Q_EMIT advancePositionChanged(arg);
         }
     }
 
diff --git a/src/particles/qquickangledirection_p.h b/src/particles/qquickangledirection_p.h
index d89455a5e7..f3283552fa 100644
--- a/src/particles/qquickangledirection_p.h
+++ b/src/particles/qquickangledirection_p.h
@@ -74,7 +74,7 @@ public:
         return m_magnitudeVariation;
     }
 
-signals:
+Q_SIGNALS:
 
     void angleChanged(qreal arg);
 
@@ -84,12 +84,12 @@ signals:
 
     void magnitudeVariationChanged(qreal arg);
 
-public slots:
+public Q_SLOTS:
 void setAngle(qreal arg)
 {
     if (m_angle != arg) {
         m_angle = arg;
-        emit angleChanged(arg);
+        Q_EMIT angleChanged(arg);
     }
 }
 
@@ -97,7 +97,7 @@ void setMagnitude(qreal arg)
 {
     if (m_magnitude != arg) {
         m_magnitude = arg;
-        emit magnitudeChanged(arg);
+        Q_EMIT magnitudeChanged(arg);
     }
 }
 
@@ -105,7 +105,7 @@ void setAngleVariation(qreal arg)
 {
     if (m_angleVariation != arg) {
         m_angleVariation = arg;
-        emit angleVariationChanged(arg);
+        Q_EMIT angleVariationChanged(arg);
     }
 }
 
@@ -113,7 +113,7 @@ void setMagnitudeVariation(qreal arg)
 {
     if (m_magnitudeVariation != arg) {
         m_magnitudeVariation = arg;
-        emit magnitudeVariationChanged(arg);
+        Q_EMIT magnitudeVariationChanged(arg);
     }
 }
 
diff --git a/src/particles/qquickcustomaffector_p.h b/src/particles/qquickcustomaffector_p.h
index 1a12684c48..d7d0c60e85 100644
--- a/src/particles/qquickcustomaffector_p.h
+++ b/src/particles/qquickcustomaffector_p.h
@@ -98,7 +98,7 @@ public:
     }
 
 
-signals:
+Q_SIGNALS:
     void affectParticles(QQmlV4Handle particles, qreal dt);
 
     void positionChanged(QQuickDirection * arg);
@@ -109,12 +109,12 @@ signals:
 
     void relativeChanged(bool arg);
 
-public slots:
+public Q_SLOTS:
     void setPosition(QQuickDirection * arg)
     {
         if (m_position != arg) {
             m_position = arg;
-            emit positionChanged(arg);
+            Q_EMIT positionChanged(arg);
         }
     }
 
@@ -122,7 +122,7 @@ public slots:
     {
         if (m_velocity != arg) {
             m_velocity = arg;
-            emit velocityChanged(arg);
+            Q_EMIT velocityChanged(arg);
         }
     }
 
@@ -130,7 +130,7 @@ public slots:
     {
         if (m_acceleration != arg) {
             m_acceleration = arg;
-            emit accelerationChanged(arg);
+            Q_EMIT accelerationChanged(arg);
         }
     }
 
@@ -138,7 +138,7 @@ public slots:
     {
         if (m_relative != arg) {
             m_relative = arg;
-            emit relativeChanged(arg);
+            Q_EMIT relativeChanged(arg);
         }
     }
 
diff --git a/src/particles/qquickdirection_p.h b/src/particles/qquickdirection_p.h
index 4ceae16b35..51e7679fda 100644
--- a/src/particles/qquickdirection_p.h
+++ b/src/particles/qquickdirection_p.h
@@ -54,9 +54,9 @@ public:
     explicit QQuickDirection(QObject *parent = 0);
 
     virtual const QPointF sample(const QPointF &from);
-signals:
+Q_SIGNALS:
 
-public slots:
+public Q_SLOTS:
 
 protected:
 };
diff --git a/src/particles/qquickellipseextruder_p.h b/src/particles/qquickellipseextruder_p.h
index a9425b6205..0625565c10 100644
--- a/src/particles/qquickellipseextruder_p.h
+++ b/src/particles/qquickellipseextruder_p.h
@@ -59,17 +59,17 @@ public:
         return m_fill;
     }
 
-signals:
+Q_SIGNALS:
 
     void fillChanged(bool arg);
 
-public slots:
+public Q_SLOTS:
 
     void setFill(bool arg)
     {
         if (m_fill != arg) {
             m_fill = arg;
-            emit fillChanged(arg);
+            Q_EMIT fillChanged(arg);
         }
     }
 private:
diff --git a/src/particles/qquickfriction_p.h b/src/particles/qquickfriction_p.h
index 13ba715e88..9b3d95df90 100644
--- a/src/particles/qquickfriction_p.h
+++ b/src/particles/qquickfriction_p.h
@@ -66,18 +66,18 @@ public:
 protected:
     virtual bool affectParticle(QQuickParticleData *d, qreal dt);
 
-signals:
+Q_SIGNALS:
 
     void factorChanged(qreal arg);
     void thresholdChanged(qreal arg);
 
-public slots:
+public Q_SLOTS:
 
     void setFactor(qreal arg)
     {
         if (m_factor != arg) {
             m_factor = arg;
-            emit factorChanged(arg);
+            Q_EMIT factorChanged(arg);
         }
     }
 
@@ -85,7 +85,7 @@ public slots:
     {
         if (m_threshold != arg) {
             m_threshold = arg;
-            emit thresholdChanged(arg);
+            Q_EMIT thresholdChanged(arg);
         }
     }
 
diff --git a/src/particles/qquickgravity_p.h b/src/particles/qquickgravity_p.h
index e6010b536e..d4c3ef4ac2 100644
--- a/src/particles/qquickgravity_p.h
+++ b/src/particles/qquickgravity_p.h
@@ -64,20 +64,20 @@ public:
     }
 protected:
     virtual bool affectParticle(QQuickParticleData *d, qreal dt);
-signals:
+Q_SIGNALS:
 
     void magnitudeChanged(qreal arg);
 
     void angleChanged(qreal arg);
 
-public slots:
+public Q_SLOTS:
 void setAcceleration(qreal arg)
 {
     qWarning() << "Gravity::acceleration has been renamed Gravity::magnitude";
     if (m_magnitude != arg) {
         m_magnitude = arg;
         m_needRecalc = true;
-        emit magnitudeChanged(arg);
+        Q_EMIT magnitudeChanged(arg);
     }
 }
 
@@ -86,7 +86,7 @@ void setMagnitude(qreal arg)
     if (m_magnitude != arg) {
         m_magnitude = arg;
         m_needRecalc = true;
-        emit magnitudeChanged(arg);
+        Q_EMIT magnitudeChanged(arg);
     }
 }
 
@@ -95,7 +95,7 @@ void setAngle(qreal arg)
     if (m_angle != arg) {
         m_angle = arg;
         m_needRecalc = true;
-        emit angleChanged(arg);
+        Q_EMIT angleChanged(arg);
     }
 }
 
diff --git a/src/particles/qquickgroupgoal_p.h b/src/particles/qquickgroupgoal_p.h
index 6a31b882a3..5d385f2f36 100644
--- a/src/particles/qquickgroupgoal_p.h
+++ b/src/particles/qquickgroupgoal_p.h
@@ -68,13 +68,13 @@ public:
 protected:
     virtual bool affectParticle(QQuickParticleData *d, qreal dt);
 
-signals:
+Q_SIGNALS:
 
     void goalStateChanged(QString arg);
 
     void jumpChanged(bool arg);
 
-public slots:
+public Q_SLOTS:
 
     void setGoalState(QString arg);
 
@@ -82,7 +82,7 @@ public slots:
     {
         if (m_jump != arg) {
             m_jump = arg;
-            emit jumpChanged(arg);
+            Q_EMIT jumpChanged(arg);
         }
     }
 
diff --git a/src/particles/qquickimageparticle_p.h b/src/particles/qquickimageparticle_p.h
index daa3d5cdbc..8f2bb715f8 100644
--- a/src/particles/qquickimageparticle_p.h
+++ b/src/particles/qquickimageparticle_p.h
@@ -263,7 +263,7 @@ public:
     void resetRotation();
     void resetDeformation();
 
-signals:
+Q_SIGNALS:
 
     void imageChanged();
     void colortableChanged();
@@ -305,7 +305,7 @@ signals:
 
     void statusChanged(Status arg);
 
-public slots:
+public Q_SLOTS:
     void reloadColor(const Color4ub &c, QQuickParticleData* d);
     void setAlphaVariation(qreal arg);
 
@@ -348,7 +348,7 @@ protected:
 
     void sceneGraphInvalidated();
 
-private slots:
+private Q_SLOTS:
     void createEngine(); //### method invoked by sprite list changing (in engine.h) - pretty nasty
 
     void spriteAdvance(int spriteIndex);
diff --git a/src/particles/qquickitemparticle_p.h b/src/particles/qquickitemparticle_p.h
index e5c7239567..d9c8555ed0 100644
--- a/src/particles/qquickitemparticle_p.h
+++ b/src/particles/qquickitemparticle_p.h
@@ -69,24 +69,24 @@ public:
         return m_delegate;
     }
 
-signals:
+Q_SIGNALS:
     void fadeChanged();
 
     void delegateChanged(QQmlComponent* arg);
 
-public slots:
+public Q_SLOTS:
     //TODO: Add a follow mode, where moving the delegate causes the logical particle to go with it?
     void freeze(QQuickItem* item);
     void unfreeze(QQuickItem* item);
     void take(QQuickItem* item,bool prioritize=false);//take by modelparticle
     void give(QQuickItem* item);//give from modelparticle
 
-    void setFade(bool arg){if (arg == m_fade) return; m_fade = arg; emit fadeChanged();}
+    void setFade(bool arg){if (arg == m_fade) return; m_fade = arg; Q_EMIT fadeChanged();}
     void setDelegate(QQmlComponent* arg)
     {
         if (m_delegate != arg) {
             m_delegate = arg;
-            emit delegateChanged(arg);
+            Q_EMIT delegateChanged(arg);
         }
     }
 
@@ -121,8 +121,8 @@ public:
         : QObject(parent), m_mp(0)
     {;}
     QQuickItemParticle* particle() {return m_mp;}
-    void detach(){emit detached();}
-    void attach(){emit attached();}
+    void detach(){Q_EMIT detached();}
+    void attach(){Q_EMIT attached();}
 private:
     QQuickItemParticle* m_mp;
     friend class QQuickItemParticle;
diff --git a/src/particles/qquicklineextruder_p.h b/src/particles/qquicklineextruder_p.h
index 503e315b24..bfbd5aed54 100644
--- a/src/particles/qquicklineextruder_p.h
+++ b/src/particles/qquicklineextruder_p.h
@@ -57,17 +57,17 @@ public:
         return m_mirrored;
     }
 
-signals:
+Q_SIGNALS:
 
     void mirroredChanged(bool arg);
 
-public slots:
+public Q_SLOTS:
 
     void setmirrored(bool arg)
     {
         if (m_mirrored != arg) {
             m_mirrored = arg;
-            emit mirroredChanged(arg);
+            Q_EMIT mirroredChanged(arg);
         }
     }
 private:
diff --git a/src/particles/qquickmaskextruder_p.h b/src/particles/qquickmaskextruder_p.h
index 5c948cc7d7..020c8762f8 100644
--- a/src/particles/qquickmaskextruder_p.h
+++ b/src/particles/qquickmaskextruder_p.h
@@ -62,14 +62,14 @@ public:
         return m_source;
     }
 
-signals:
+Q_SIGNALS:
 
     void sourceChanged(QUrl arg);
 
-public slots:
+public Q_SLOTS:
     void setSource(QUrl arg);
 
-private slots:
+private Q_SLOTS:
     void startMaskLoading();
     void finishMaskLoading();
 
diff --git a/src/particles/qquickparticleaffector_p.h b/src/particles/qquickparticleaffector_p.h
index 2629ecc676..5ee8430472 100644
--- a/src/particles/qquickparticleaffector_p.h
+++ b/src/particles/qquickparticleaffector_p.h
@@ -92,7 +92,7 @@ public:
         return m_whenCollidingWith;
     }
 
-signals:
+Q_SIGNALS:
 
     void systemChanged(QQuickParticleSystem* arg);
 
@@ -108,13 +108,13 @@ signals:
 
     void whenCollidingWithChanged(QStringList arg);
 
-public slots:
+public Q_SLOTS:
 void setSystem(QQuickParticleSystem* arg)
 {
     if (m_system != arg) {
         m_system = arg;
         m_system->registerParticleAffector(this);
-        emit systemChanged(arg);
+        Q_EMIT systemChanged(arg);
     }
 }
 
@@ -123,7 +123,7 @@ void setGroups(QStringList arg)
     if (m_groups != arg) {
         m_groups = arg;
         m_updateIntSet = true;
-        emit groupsChanged(arg);
+        Q_EMIT groupsChanged(arg);
     }
 }
 
@@ -131,7 +131,7 @@ void setEnabled(bool arg)
 {
     if (m_enabled != arg) {
         m_enabled = arg;
-        emit enabledChanged(arg);
+        Q_EMIT enabledChanged(arg);
     }
 }
 
@@ -140,7 +140,7 @@ void setOnceOff(bool arg)
     if (m_onceOff != arg) {
         m_onceOff = arg;
         m_needsReset = true;
-        emit onceChanged(arg);
+        Q_EMIT onceChanged(arg);
     }
 }
 
@@ -148,7 +148,7 @@ void setShape(QQuickParticleExtruder* arg)
 {
     if (m_shape != arg) {
         m_shape = arg;
-        emit shapeChanged(arg);
+        Q_EMIT shapeChanged(arg);
     }
 }
 
@@ -156,10 +156,10 @@ void setWhenCollidingWith(QStringList arg)
 {
     if (m_whenCollidingWith != arg) {
         m_whenCollidingWith = arg;
-        emit whenCollidingWithChanged(arg);
+        Q_EMIT whenCollidingWithChanged(arg);
     }
 }
-public slots:
+public Q_SLOTS:
     void updateOffsets();
 
 protected:
diff --git a/src/particles/qquickparticleemitter_p.h b/src/particles/qquickparticleemitter_p.h
index 051e27816d..edca86d53d 100644
--- a/src/particles/qquickparticleemitter_p.h
+++ b/src/particles/qquickparticleemitter_p.h
@@ -118,7 +118,7 @@ public:
     qreal velocityFromMovement() const { return m_velocity_from_movement; }
     void setVelocityFromMovement(qreal s);
     virtual void componentComplete();
-signals:
+Q_SIGNALS:
     void emitParticles(QQmlV4Handle particles);
     void particlesPerSecondChanged(qreal);
     void particleDurationChanged(int);
@@ -149,7 +149,7 @@ signals:
 
     void startTimeChanged(int arg);
 
-public slots:
+public Q_SLOTS:
     void pulse(int milliseconds);
     void burst(int num);
     void burst(int num, qreal x, qreal y);
@@ -160,7 +160,7 @@ public slots:
     {
         if (m_particlesPerSecond != arg) {
             m_particlesPerSecond = arg;
-            emit particlesPerSecondChanged(arg);
+            Q_EMIT particlesPerSecondChanged(arg);
         }
     }
 
@@ -168,7 +168,7 @@ public slots:
     {
         if (m_particleDuration != arg) {
             m_particleDuration = arg;
-            emit particleDurationChanged(arg);
+            Q_EMIT particleDurationChanged(arg);
         }
     }
 
@@ -178,7 +178,7 @@ public slots:
             m_system = arg;
             if (m_system)
                 m_system->registerParticleEmitter(this);
-            emit systemChanged(arg);
+            Q_EMIT systemChanged(arg);
         }
     }
 
@@ -186,7 +186,7 @@ public slots:
     {
         if (m_group != arg) {
             m_group = arg;
-            emit groupChanged(arg);
+            Q_EMIT groupChanged(arg);
         }
     }
 
@@ -194,14 +194,14 @@ public slots:
     {
         if (m_particleDurationVariation != arg) {
             m_particleDurationVariation = arg;
-            emit particleDurationVariationChanged(arg);
+            Q_EMIT particleDurationVariationChanged(arg);
         }
     }
     void setExtruder(QQuickParticleExtruder* arg)
     {
         if (m_extruder != arg) {
             m_extruder = arg;
-            emit extruderChanged(arg);
+            Q_EMIT extruderChanged(arg);
         }
     }
 
@@ -209,7 +209,7 @@ public slots:
     {
         if (m_particleSize != arg) {
             m_particleSize = arg;
-            emit particleSizeChanged(arg);
+            Q_EMIT particleSizeChanged(arg);
         }
     }
 
@@ -217,7 +217,7 @@ public slots:
     {
         if (m_particleEndSize != arg) {
             m_particleEndSize = arg;
-            emit particleEndSizeChanged(arg);
+            Q_EMIT particleEndSizeChanged(arg);
         }
     }
 
@@ -225,7 +225,7 @@ public slots:
     {
         if (m_particleSizeVariation != arg) {
             m_particleSizeVariation = arg;
-            emit particleSizeVariationChanged(arg);
+            Q_EMIT particleSizeVariationChanged(arg);
         }
     }
 
@@ -233,7 +233,7 @@ public slots:
     {
         if (m_velocity != arg) {
             m_velocity = arg;
-            emit velocityChanged(arg);
+            Q_EMIT velocityChanged(arg);
         }
     }
 
@@ -241,7 +241,7 @@ public slots:
     {
         if (m_acceleration != arg) {
             m_acceleration = arg;
-            emit accelerationChanged(arg);
+            Q_EMIT accelerationChanged(arg);
         }
     }
 
@@ -251,7 +251,7 @@ public slots:
     {
         if (m_startTime != arg) {
             m_startTime = arg;
-            emit startTimeChanged(arg);
+            Q_EMIT startTimeChanged(arg);
         }
     }
 
diff --git a/src/particles/qquickparticleextruder_p.h b/src/particles/qquickparticleextruder_p.h
index 36edc9cf06..c6d717dabe 100644
--- a/src/particles/qquickparticleextruder_p.h
+++ b/src/particles/qquickparticleextruder_p.h
@@ -57,8 +57,8 @@ public:
     virtual QPointF extrude(const QRectF &);
     virtual bool contains(const QRectF &bounds, const QPointF &point);
 
-signals:
-public slots:
+Q_SIGNALS:
+public Q_SLOTS:
 protected:
 };
 
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);
 
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:
diff --git a/src/particles/qquickparticlesystem_p.h b/src/particles/qquickparticlesystem_p.h
index df57cd2cc7..cda505e4b4 100644
--- a/src/particles/qquickparticlesystem_p.h
+++ b/src/particles/qquickparticlesystem_p.h
@@ -254,14 +254,14 @@ public:
 
     static const int maxLife = 600000;
 
-signals:
+Q_SIGNALS:
 
     void systemInitialized();
     void runningChanged(bool arg);
     void pausedChanged(bool arg);
     void emptyChanged(bool arg);
 
-public slots:
+public Q_SLOTS:
     void start(){setRunning(true);}
     void stop(){setRunning(false);}
     void restart(){setRunning(false);setRunning(true);}
@@ -279,7 +279,7 @@ protected:
     //This one only once per frame (effectively)
     void componentComplete();
 
-private slots:
+private Q_SLOTS:
     void emittersChanged();
     void loadPainter(QObject* p);
     void createEngine(); //Not invoked by sprite engine, unlike Sprite uses
diff --git a/src/particles/qquickpointattractor_p.h b/src/particles/qquickpointattractor_p.h
index 1332591daf..6747798364 100644
--- a/src/particles/qquickpointattractor_p.h
+++ b/src/particles/qquickpointattractor_p.h
@@ -98,7 +98,7 @@ public:
         return m_proportionalToDistance;
     }
 
-signals:
+Q_SIGNALS:
 
     void strengthChanged(qreal arg);
 
@@ -110,12 +110,12 @@ signals:
 
     void proportionalToDistanceChanged(Proportion arg);
 
-public slots:
+public Q_SLOTS:
 void setStrength(qreal arg)
 {
     if (m_strength != arg) {
         m_strength = arg;
-        emit strengthChanged(arg);
+        Q_EMIT strengthChanged(arg);
     }
 }
 
@@ -123,7 +123,7 @@ void setPointX(qreal arg)
 {
     if (m_x != arg) {
         m_x = arg;
-        emit pointXChanged(arg);
+        Q_EMIT pointXChanged(arg);
     }
 }
 
@@ -131,14 +131,14 @@ void setPointY(qreal arg)
 {
     if (m_y != arg) {
         m_y = arg;
-        emit pointYChanged(arg);
+        Q_EMIT pointYChanged(arg);
     }
 }
 void setAffectedParameter(AffectableParameters arg)
 {
     if (m_physics != arg) {
         m_physics = arg;
-        emit affectedParameterChanged(arg);
+        Q_EMIT affectedParameterChanged(arg);
     }
 }
 
@@ -146,7 +146,7 @@ void setProportionalToDistance(Proportion arg)
 {
     if (m_proportionalToDistance != arg) {
         m_proportionalToDistance = arg;
-        emit proportionalToDistanceChanged(arg);
+        Q_EMIT proportionalToDistanceChanged(arg);
     }
 }
 
diff --git a/src/particles/qquickpointdirection_p.h b/src/particles/qquickpointdirection_p.h
index eae385a3b7..e4c8624c9c 100644
--- a/src/particles/qquickpointdirection_p.h
+++ b/src/particles/qquickpointdirection_p.h
@@ -75,7 +75,7 @@ public:
         return m_yVariation;
     }
 
-signals:
+Q_SIGNALS:
 
     void xChanged(qreal arg);
 
@@ -85,12 +85,12 @@ signals:
 
     void yVariationChanged(qreal arg);
 
-public slots:
+public Q_SLOTS:
     void setX(qreal arg)
     {
         if (m_x != arg) {
             m_x = arg;
-            emit xChanged(arg);
+            Q_EMIT xChanged(arg);
         }
     }
 
@@ -98,7 +98,7 @@ public slots:
     {
         if (m_y != arg) {
             m_y = arg;
-            emit yChanged(arg);
+            Q_EMIT yChanged(arg);
         }
     }
 
@@ -106,7 +106,7 @@ public slots:
     {
         if (m_xVariation != arg) {
             m_xVariation = arg;
-            emit xVariationChanged(arg);
+            Q_EMIT xVariationChanged(arg);
         }
     }
 
@@ -114,7 +114,7 @@ public slots:
     {
         if (m_yVariation != arg) {
             m_yVariation = arg;
-            emit yVariationChanged(arg);
+            Q_EMIT yVariationChanged(arg);
         }
     }
 
diff --git a/src/particles/qquickrectangleextruder_p.h b/src/particles/qquickrectangleextruder_p.h
index e0480687a0..f8ab2343c3 100644
--- a/src/particles/qquickrectangleextruder_p.h
+++ b/src/particles/qquickrectangleextruder_p.h
@@ -60,17 +60,17 @@ public:
         return m_fill;
     }
 
-signals:
+Q_SIGNALS:
 
     void fillChanged(bool arg);
 
-public slots:
+public Q_SLOTS:
 
     void setFill(bool arg)
     {
         if (m_fill != arg) {
             m_fill = arg;
-            emit fillChanged(arg);
+            Q_EMIT fillChanged(arg);
         }
     }
 protected:
diff --git a/src/particles/qquickspritegoal_p.h b/src/particles/qquickspritegoal_p.h
index 4d5f192f0a..c5c7539b58 100644
--- a/src/particles/qquickspritegoal_p.h
+++ b/src/particles/qquickspritegoal_p.h
@@ -73,7 +73,7 @@ public:
 
 protected:
     virtual bool affectParticle(QQuickParticleData *d, qreal dt);
-signals:
+Q_SIGNALS:
 
     void goalStateChanged(QString arg);
 
@@ -81,7 +81,7 @@ signals:
 
     void systemStatesChanged(bool arg);
 
-public slots:
+public Q_SLOTS:
 
 void setGoalState(QString arg);
 
@@ -89,7 +89,7 @@ void setJump(bool arg)
 {
     if (m_jump != arg) {
         m_jump = arg;
-        emit jumpChanged(arg);
+        Q_EMIT jumpChanged(arg);
     }
 }
 
@@ -99,7 +99,7 @@ void setSystemStates(bool arg)
         //TODO: GroupGoal was added (and this deprecated) Oct 4 - remove it in a few weeks.
         qmlInfo(this) << "systemStates is deprecated and will be removed soon. Use GroupGoal instead.";
         m_systemStates = arg;
-        emit systemStatesChanged(arg);
+        Q_EMIT systemStatesChanged(arg);
     }
 }
 
diff --git a/src/particles/qquicktargetdirection_p.h b/src/particles/qquicktargetdirection_p.h
index 886a560271..50bfdbe8ec 100644
--- a/src/particles/qquicktargetdirection_p.h
+++ b/src/particles/qquicktargetdirection_p.h
@@ -99,7 +99,7 @@ public:
         return m_targetItem;
     }
 
-signals:
+Q_SIGNALS:
 
     void targetXChanged(qreal arg);
 
@@ -115,12 +115,12 @@ signals:
 
     void targetItemChanged(QQuickItem* arg);
 
-public slots:
+public Q_SLOTS:
     void setTargetX(qreal arg)
     {
         if (m_targetX != arg) {
             m_targetX = arg;
-            emit targetXChanged(arg);
+            Q_EMIT targetXChanged(arg);
         }
     }
 
@@ -128,7 +128,7 @@ public slots:
     {
         if (m_targetY != arg) {
             m_targetY = arg;
-            emit targetYChanged(arg);
+            Q_EMIT targetYChanged(arg);
         }
     }
 
@@ -136,7 +136,7 @@ public slots:
     {
         if (m_targetVariation != arg) {
             m_targetVariation = arg;
-            emit targetVariationChanged(arg);
+            Q_EMIT targetVariationChanged(arg);
         }
     }
 
@@ -144,7 +144,7 @@ public slots:
     {
         if (m_magnitude != arg) {
             m_magnitude = arg;
-            emit magnitudeChanged(arg);
+            Q_EMIT magnitudeChanged(arg);
         }
     }
 
@@ -152,7 +152,7 @@ public slots:
     {
         if (m_proportionalMagnitude != arg) {
             m_proportionalMagnitude = arg;
-            emit proprotionalMagnitudeChanged(arg);
+            Q_EMIT proprotionalMagnitudeChanged(arg);
         }
     }
 
@@ -160,7 +160,7 @@ public slots:
     {
         if (m_magnitudeVariation != arg) {
             m_magnitudeVariation = arg;
-            emit magnitudeVariationChanged(arg);
+            Q_EMIT magnitudeVariationChanged(arg);
         }
     }
 
@@ -168,7 +168,7 @@ public slots:
     {
         if (m_targetItem != arg) {
             m_targetItem = arg;
-            emit targetItemChanged(arg);
+            Q_EMIT targetItemChanged(arg);
         }
     }
 
diff --git a/src/particles/qquicktrailemitter_p.h b/src/particles/qquicktrailemitter_p.h
index 54041f1751..f3f6884417 100644
--- a/src/particles/qquicktrailemitter_p.h
+++ b/src/particles/qquicktrailemitter_p.h
@@ -90,7 +90,7 @@ public:
         return m_emissionExtruder;
     }
 
-signals:
+Q_SIGNALS:
     void emitFollowParticles(QQmlV4Handle particles, QQmlV4Handle followed);
 
     void particlesPerParticlePerSecondChanged(int arg);
@@ -103,20 +103,20 @@ signals:
 
     void emissionShapeChanged(QQuickParticleExtruder* arg);
 
-public slots:
+public Q_SLOTS:
 
     void setParticlesPerParticlePerSecond(int arg)
     {
         if (m_particlesPerParticlePerSecond != arg) {
             m_particlesPerParticlePerSecond = arg;
-            emit particlesPerParticlePerSecondChanged(arg);
+            Q_EMIT particlesPerParticlePerSecondChanged(arg);
         }
     }
     void setEmitterXVariation(qreal arg)
     {
         if (m_emitterXVariation != arg) {
             m_emitterXVariation = arg;
-            emit emitterXVariationChanged(arg);
+            Q_EMIT emitterXVariationChanged(arg);
         }
     }
 
@@ -124,7 +124,7 @@ public slots:
     {
         if (m_emitterYVariation != arg) {
             m_emitterYVariation = arg;
-            emit emitterYVariationChanged(arg);
+            Q_EMIT emitterYVariationChanged(arg);
         }
     }
 
@@ -132,7 +132,7 @@ public slots:
     {
         if (m_follow != arg) {
             m_follow = arg;
-            emit followChanged(arg);
+            Q_EMIT followChanged(arg);
         }
     }
 
@@ -140,11 +140,11 @@ public slots:
     {
         if (m_emissionExtruder != arg) {
             m_emissionExtruder = arg;
-            emit emissionShapeChanged(arg);
+            Q_EMIT emissionShapeChanged(arg);
         }
     }
 
-private slots:
+private Q_SLOTS:
     void recalcParticlesPerSecond();
 
 private:
diff --git a/src/particles/qquickturbulence_p.h b/src/particles/qquickturbulence_p.h
index eea550ed15..b66d57fa49 100644
--- a/src/particles/qquickturbulence_p.h
+++ b/src/particles/qquickturbulence_p.h
@@ -67,19 +67,19 @@ class QQuickTurbulenceAffector : public QQuickParticleAffector
     {
         return m_noiseSource;
     }
-signals:
+Q_SIGNALS:
 
     void strengthChanged(qreal arg);
 
     void noiseSourceChanged(QUrl arg);
 
-public slots:
+public Q_SLOTS:
 
     void setStrength(qreal arg)
     {
         if (m_strength != arg) {
             m_strength = arg;
-            emit strengthChanged(arg);
+            Q_EMIT strengthChanged(arg);
         }
     }
 
@@ -87,7 +87,7 @@ public slots:
     {
         if (m_noiseSource != arg) {
             m_noiseSource = arg;
-            emit noiseSourceChanged(arg);
+            Q_EMIT noiseSourceChanged(arg);
             initializeGrid();
         }
     }
diff --git a/src/particles/qquickwander_p.h b/src/particles/qquickwander_p.h
index 0f09418ea2..efa68910d4 100644
--- a/src/particles/qquickwander_p.h
+++ b/src/particles/qquickwander_p.h
@@ -97,7 +97,7 @@ public:
 
 protected:
     virtual bool affectParticle(QQuickParticleData *d, qreal dt);
-signals:
+Q_SIGNALS:
 
     void xVarianceChanged(qreal arg);
 
@@ -108,12 +108,12 @@ signals:
 
     void affectedParameterChanged(AffectableParameters arg);
 
-public slots:
+public Q_SLOTS:
 void setXVariance(qreal arg)
 {
     if (m_xVariance != arg) {
         m_xVariance = arg;
-        emit xVarianceChanged(arg);
+        Q_EMIT xVarianceChanged(arg);
     }
 }
 
@@ -121,7 +121,7 @@ void setYVariance(qreal arg)
 {
     if (m_yVariance != arg) {
         m_yVariance = arg;
-        emit yVarianceChanged(arg);
+        Q_EMIT yVarianceChanged(arg);
     }
 }
 
@@ -129,7 +129,7 @@ void setPace(qreal arg)
 {
     if (m_pace != arg) {
         m_pace = arg;
-        emit paceChanged(arg);
+        Q_EMIT paceChanged(arg);
     }
 }
 
@@ -138,7 +138,7 @@ void setAffectedParameter(AffectableParameters arg)
 {
     if (m_affectedParameter != arg) {
         m_affectedParameter = arg;
-        emit affectedParameterChanged(arg);
+        Q_EMIT affectedParameterChanged(arg);
     }
 }