diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-03-21 20:42:38 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-03-21 20:42:47 +0100 |
| commit | 6767114285db9d0e16dc278d08f231e8561546b4 (patch) | |
| tree | 0945902a2242fd7ec0a1f7fd3e6acbb769e723bd /src/qml/qml/ftw/qbitfield_p.h | |
| parent | ee076afedccbe1d37306a7972051f84eb036d655 (diff) | |
| parent | c32b109e9dea44c6775c2dbf8f164870c1dc8971 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: Ib5662d80d5b2f58cf4634c54c054545ba9df807e
Diffstat (limited to 'src/qml/qml/ftw/qbitfield_p.h')
| -rw-r--r-- | src/qml/qml/ftw/qbitfield_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/ftw/qbitfield_p.h b/src/qml/qml/ftw/qbitfield_p.h index 8f35842249..92017580d6 100644 --- a/src/qml/qml/ftw/qbitfield_p.h +++ b/src/qml/qml/ftw/qbitfield_p.h @@ -77,12 +77,12 @@ private: }; QBitField::QBitField() -: bits(0), ownData(0), data(0) +: bits(0), ownData(nullptr), data(nullptr) { } QBitField::QBitField(const quint32 *bitData, int bitCount) -: bits((quint32)bitCount), ownData(0), data(bitData) +: bits((quint32)bitCount), ownData(nullptr), data(bitData) { } |