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/qquickparticlesystem_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/qquickparticlesystem_p.h')
-rw-r--r-- | src/particles/qquickparticlesystem_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
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 |