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/quick/items/qquickanimatedsprite_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/quick/items/qquickanimatedsprite_p.h')
-rw-r--r-- | src/quick/items/qquickanimatedsprite_p.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/quick/items/qquickanimatedsprite_p.h b/src/quick/items/qquickanimatedsprite_p.h index 6d0a821a47..b7b25900e8 100644 --- a/src/quick/items/qquickanimatedsprite_p.h +++ b/src/quick/items/qquickanimatedsprite_p.h @@ -160,7 +160,7 @@ public: return m_curFrame; } -signals: +Q_SIGNALS: void pausedChanged(bool arg); void runningChanged(bool arg); @@ -190,7 +190,7 @@ signals: void currentFrameChanged(int arg); -public slots: +public Q_SLOTS: void start(); void stop(); void restart() {stop(); start();} @@ -222,7 +222,7 @@ public slots: { if (m_interpolate != arg) { m_interpolate = arg; - emit interpolateChanged(arg); + Q_EMIT interpolateChanged(arg); } } @@ -230,7 +230,7 @@ public slots: { if (m_sprite->m_source != arg) { m_sprite->setSource(arg); - emit sourceChanged(arg); + Q_EMIT sourceChanged(arg); reloadImage(); } } @@ -239,7 +239,7 @@ public slots: { if (m_sprite->m_reverse != arg) { m_sprite->setReverse(arg); - emit reverseChanged(arg); + Q_EMIT reverseChanged(arg); } } @@ -247,7 +247,7 @@ public slots: { if (m_sprite->m_frameSync != arg) { m_sprite->setFrameSync(arg); - emit frameSyncChanged(arg); + Q_EMIT frameSyncChanged(arg); if (m_running) restart(); } @@ -257,7 +257,7 @@ public slots: { if (m_sprite->m_frames != arg) { m_sprite->setFrameCount(arg); - emit frameCountChanged(arg); + Q_EMIT frameCountChanged(arg); reloadImage(); } } @@ -266,7 +266,7 @@ public slots: { if (m_sprite->m_frameHeight != arg) { m_sprite->setFrameHeight(arg); - emit frameHeightChanged(arg); + Q_EMIT frameHeightChanged(arg); reloadImage(); } } @@ -275,7 +275,7 @@ public slots: { if (m_sprite->m_frameWidth != arg) { m_sprite->setFrameWidth(arg); - emit frameWidthChanged(arg); + Q_EMIT frameWidthChanged(arg); reloadImage(); } } @@ -284,7 +284,7 @@ public slots: { if (m_sprite->m_frameX != arg) { m_sprite->setFrameX(arg); - emit frameXChanged(arg); + Q_EMIT frameXChanged(arg); reloadImage(); } } @@ -293,7 +293,7 @@ public slots: { if (m_sprite->m_frameY != arg) { m_sprite->setFrameY(arg); - emit frameYChanged(arg); + Q_EMIT frameYChanged(arg); reloadImage(); } } @@ -302,7 +302,7 @@ public slots: { if (m_sprite->m_frameRate != arg) { m_sprite->setFrameRate(arg); - emit frameRateChanged(arg); + Q_EMIT frameRateChanged(arg); if (m_running) restart(); } @@ -312,7 +312,7 @@ public slots: { if (m_sprite->m_frameDuration != arg) { m_sprite->setFrameDuration(arg); - emit frameDurationChanged(arg); + Q_EMIT frameDurationChanged(arg); if (m_running) restart(); } @@ -332,7 +332,7 @@ public slots: { if (m_loops != arg) { m_loops = arg; - emit loopsChanged(arg); + Q_EMIT loopsChanged(arg); } } @@ -340,12 +340,12 @@ public slots: { if (m_curFrame != arg) { m_curFrame = arg; - emit currentFrameChanged(arg); //TODO-C Only emitted on manual advance! + Q_EMIT currentFrameChanged(arg); //TODO-C Only emitted on manual advance! } } -private slots: +private Q_SLOTS: void createEngine(); void sizeVertices(); |