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