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/qquickcustomaffector_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/qquickcustomaffector_p.h')
-rw-r--r-- | src/particles/qquickcustomaffector_p.h | 12 |
1 files changed, 6 insertions, 6 deletions
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); } } |