diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-12-03 06:55:21 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-12-03 06:57:05 +0100 |
| commit | e62d04b933a91c2bdd347aa97dc15ba210a04d2a (patch) | |
| tree | 67c67af5f59d9b71522738da8a8d2d803e3ff44f /tests/manual/highdpi/dragwidget.h | |
| parent | f81f21151d30a37f955aa4af2398a96507626b15 (diff) | |
| parent | 9ac156c90b92a981f70929e081c64083b14e9a57 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/corelib/serialization/qcborvalue.cpp
Change-Id: I675a3029955c96e81a33ed9d98b72b55b6784b52
Diffstat (limited to 'tests/manual/highdpi/dragwidget.h')
| -rw-r--r-- | tests/manual/highdpi/dragwidget.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/manual/highdpi/dragwidget.h b/tests/manual/highdpi/dragwidget.h index 8b67b20410..06663fc74a 100644 --- a/tests/manual/highdpi/dragwidget.h +++ b/tests/manual/highdpi/dragwidget.h @@ -40,7 +40,7 @@ QT_END_NAMESPACE class DragWidget : public QWidget { public: - DragWidget(QString text = QString(), QWidget *parent = 0); + DragWidget(QString text = QString(), QWidget *parent = nullptr); protected: void dragEnterEvent(QDragEnterEvent *event) override; @@ -52,12 +52,13 @@ protected: void timerEvent(QTimerEvent *event) override; void showEvent(QShowEvent *event) override; void hideEvent(QHideEvent *event) override; + private: QPoint dragPos; QPoint dropPos; QBasicTimer dragTimer; QBasicTimer dropTimer; - QWidget *otherWindow; + QWidget *otherWindow = nullptr; }; #endif // DRAGWIDGET_H |