diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-13 01:00:43 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-13 01:00:43 +0200 |
commit | 8d8140dffa9aa680a519b501fc5bdf08c91dd735 (patch) | |
tree | 346d255ca98fd79aaef9db84eac724a49285da1c /examples/widgets/effects | |
parent | e55a79b022e542a482177c2f34140c23b100b708 (diff) | |
parent | a90899df4330afccd8299fa81754f369e6d12344 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I9953c1ca16862184c2373027e946c482ce8e6f0e
Diffstat (limited to 'examples/widgets/effects')
-rw-r--r-- | examples/widgets/effects/blurpicker/blurpicker.h | 2 | ||||
-rw-r--r-- | examples/widgets/effects/fademessage/fademessage.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/widgets/effects/blurpicker/blurpicker.h b/examples/widgets/effects/blurpicker/blurpicker.h index 3f444419a8..dc7fc4dabb 100644 --- a/examples/widgets/effects/blurpicker/blurpicker.h +++ b/examples/widgets/effects/blurpicker/blurpicker.h @@ -63,7 +63,7 @@ class BlurPicker: public QGraphicsView Q_PROPERTY(qreal index READ index WRITE setIndex) public: - BlurPicker(QWidget *parent = 0); + BlurPicker(QWidget *parent = nullptr); qreal index() const; void setIndex(qreal); diff --git a/examples/widgets/effects/fademessage/fademessage.h b/examples/widgets/effects/fademessage/fademessage.h index d17a1616ce..4d84c4ed21 100644 --- a/examples/widgets/effects/fademessage/fademessage.h +++ b/examples/widgets/effects/fademessage/fademessage.h @@ -62,7 +62,7 @@ class FadeMessage: public QGraphicsView Q_OBJECT public: - FadeMessage(QWidget *parent = 0); + FadeMessage(QWidget *parent = nullptr); private: void setupScene(); |