diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-03-08 18:35:03 +0100 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-03-08 18:35:03 +0100 |
| commit | d9ea4917ca97aeee050a86151fbfa069771b498d (patch) | |
| tree | 21fd6960d8a866bf6f5a5a8f9db9be801f8065c1 /src/quick/items/qquickspritesequence_p.h | |
| parent | f9beafddd256cd0b79bf2478a812053ef61241fc (diff) | |
| parent | c6a26c248e8abc421b87c3dd6b2466d490ea902e (diff) | |
Merge remote-tracking branch 'gerrit/5.11' into wip/webassembly
Change-Id: I729af792166fd2f6c5843ba564e63adf8ae09a97
Diffstat (limited to 'src/quick/items/qquickspritesequence_p.h')
| -rw-r--r-- | src/quick/items/qquickspritesequence_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickspritesequence_p.h b/src/quick/items/qquickspritesequence_p.h index ffcefecaec..899ce79e0e 100644 --- a/src/quick/items/qquickspritesequence_p.h +++ b/src/quick/items/qquickspritesequence_p.h @@ -77,7 +77,7 @@ class Q_AUTOTEST_EXPORT QQuickSpriteSequence : public QQuickItem Q_CLASSINFO("DefaultProperty", "sprites") public: - explicit QQuickSpriteSequence(QQuickItem *parent = 0); + explicit QQuickSpriteSequence(QQuickItem *parent = nullptr); QQmlListProperty<QQuickSprite> sprites(); |