diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2016-10-13 17:21:41 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2016-10-13 17:21:48 +0200 |
| commit | 90fa3414156522ef89f9ebe8cefd6dad303ce06c (patch) | |
| tree | 65ba250895722795ce3d14fb9b4341953ffd1733 /src/particles/qquicktrailemitter_p.h | |
| parent | 2a999f870e791d99c5c0463a11be05fc5a14dfcc (diff) | |
| parent | a05fec277d0a122e03bb6c7756777729df50b1f2 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: Ica09141c3d3c4f9e8585c9dc66a050158a25f446
Diffstat (limited to 'src/particles/qquicktrailemitter_p.h')
| -rw-r--r-- | src/particles/qquicktrailemitter_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/particles/qquicktrailemitter_p.h b/src/particles/qquicktrailemitter_p.h index b70f34999a..99464436ba 100644 --- a/src/particles/qquicktrailemitter_p.h +++ b/src/particles/qquicktrailemitter_p.h @@ -71,8 +71,8 @@ public: }; Q_ENUM(EmitSize) explicit QQuickTrailEmitter(QQuickItem *parent = 0); - virtual void emitWindow(int timeStamp); - virtual void reset(); + void emitWindow(int timeStamp) override; + void reset() override; int particlesPerParticlePerSecond() const { |