diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-24 10:37:17 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-24 13:40:55 +0200 |
| commit | fa9d12f4a20d618caedc77880459fa1af75fd50d (patch) | |
| tree | 11bd3cb4541afb924b3ee17f867133e71eb0e090 /examples/widgets/draganddrop/draggabletext/dragwidget.h | |
| parent | 895cb4681ee78caaf9b99c88390a74ff1d79ae61 (diff) | |
| parent | f174d31667dca184439f520b9624a1471d9556a6 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/plugins/platforms/windows/qwindowsmousehandler.cpp
src/plugins/platforms/xcb/qxcbimage.cpp
tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
tests/manual/qtabletevent/regular_widgets/main.cpp
Done-with: Friedemann Kleint<Friedemann.Kleint@qt.io>
Done-with: Mårten Nordheim<marten.nordheim@qt.io>
Change-Id: I5b2499513a92c590ed0756f7d2e93c35a64b7f30
Diffstat (limited to 'examples/widgets/draganddrop/draggabletext/dragwidget.h')
| -rw-r--r-- | examples/widgets/draganddrop/draggabletext/dragwidget.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/widgets/draganddrop/draggabletext/dragwidget.h b/examples/widgets/draganddrop/draggabletext/dragwidget.h index 24d1f6f5c7..38abb0ceb8 100644 --- a/examples/widgets/draganddrop/draggabletext/dragwidget.h +++ b/examples/widgets/draganddrop/draggabletext/dragwidget.h @@ -61,7 +61,7 @@ QT_END_NAMESPACE class DragWidget : public QWidget { public: - DragWidget(QWidget *parent = 0); + explicit DragWidget(QWidget *parent = nullptr); protected: void dragEnterEvent(QDragEnterEvent *event) override; |