diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-11-21 13:10:02 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-11-22 10:27:21 +0100 |
| commit | 744e77b841878fb017c0f2d60607090008f28180 (patch) | |
| tree | ef0f95935b0d6bd589f1abfc19d637c1172a96d5 /src/quick/items/qquickitem_p.h | |
| parent | 89fc75c667adc23036cbbdb4bf56251d7b988a6b (diff) | |
Avoid initializing QFlags with 0 or nullptr
It is being deprecated.
Change-Id: I844bd92af85bc53a8fc0371408d05277bd49f511
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/quick/items/qquickitem_p.h')
| -rw-r--r-- | src/quick/items/qquickitem_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h index 7c3325fd90..bc0d04c763 100644 --- a/src/quick/items/qquickitem_p.h +++ b/src/quick/items/qquickitem_p.h @@ -336,7 +336,7 @@ public: struct ChangeListener { using ChangeTypes = QQuickItemPrivate::ChangeTypes; - ChangeListener(QQuickItemChangeListener *l = nullptr, ChangeTypes t = nullptr) + ChangeListener(QQuickItemChangeListener *l = nullptr, ChangeTypes t = { }) : listener(l) , types(t) , gTypes(QQuickGeometryChange::All) @@ -937,7 +937,7 @@ private: Qt::MouseButtons QQuickItemPrivate::acceptedMouseButtons() const { return ((extra.flag() ? Qt::LeftButton : Qt::MouseButton(0)) | - (extra.isAllocated() ? extra->acceptedMouseButtons : Qt::MouseButtons(nullptr))); + (extra.isAllocated() ? extra->acceptedMouseButtons : Qt::MouseButtons{})); } QSGContext *QQuickItemPrivate::sceneGraphContext() const |