diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-09-28 16:43:20 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-29 13:24:11 +0200 |
| commit | 2ccd293d722a235bf0fe04fcef187d9073422ebe (patch) | |
| tree | 7f0455dda217923f37ea9e0c7e274d62d822716b /src/declarative/particles | |
| parent | 489c6ea0ca9cb3cf907832877b6d3250028a7820 (diff) | |
Declarative: Compile on Windows.
- Remove UTF8 special characters from comments in qsgcontext2d.cpp.
Change-Id: I7ba71f7db72d6d31dec115483ff785a0ce79d0e2
Reviewed-on: http://codereview.qt-project.org/5738
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/declarative/particles')
| -rw-r--r-- | src/declarative/particles/qsgparticlegroup_p.h | 1 | ||||
| -rw-r--r-- | src/declarative/particles/qsgparticlepainter.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/particles/qsgparticlegroup_p.h b/src/declarative/particles/qsgparticlegroup_p.h index d0ac41ca79..a809b63e8a 100644 --- a/src/declarative/particles/qsgparticlegroup_p.h +++ b/src/declarative/particles/qsgparticlegroup_p.h @@ -57,6 +57,7 @@ class QSGParticleGroup : public QSGStochasticState, public QDeclarativeParserSta //Intercept children requests and assign to the group & system Q_PROPERTY(QDeclarativeListProperty<QObject> particleChildren READ particleChildren DESIGNABLE false)//### Hidden property for in-state system definitions - ought not to be used in actual "Sprite" states Q_CLASSINFO("DefaultProperty", "particleChildren") + Q_INTERFACES(QDeclarativeParserStatus) public: explicit QSGParticleGroup(QObject* parent = 0); diff --git a/src/declarative/particles/qsgparticlepainter.cpp b/src/declarative/particles/qsgparticlepainter.cpp index 53f2421b9c..fe689ee4f7 100644 --- a/src/declarative/particles/qsgparticlepainter.cpp +++ b/src/declarative/particles/qsgparticlepainter.cpp @@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE */ QSGParticlePainter::QSGParticlePainter(QSGItem *parent) : QSGItem(parent), - m_system(0), m_count(0), m_sentinel(new QSGParticleData(0)), m_pleaseReset(true) + m_system(0), m_count(0), m_pleaseReset(true), m_sentinel(new QSGParticleData(0)) { } |