diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-09-09 15:55:04 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-12 16:54:03 +0200 |
commit | 526f111b059e18414e3a03c7f9a2b8c2ed65be7a (patch) | |
tree | d4006eb9b88fae752345be33a8b74889908d9562 /src/particles/qquickwander_p.h | |
parent | 48f278f723cc1527b1e785c416192083e67dc292 (diff) |
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>
Diffstat (limited to 'src/particles/qquickwander_p.h')
-rw-r--r-- | src/particles/qquickwander_p.h | 12 |
1 files changed, 6 insertions, 6 deletions
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); } } |