diff options
| author | Friedemann Kleint <[email protected]> | 2013-10-18 17:24:24 +0300 |
|---|---|---|
| committer | The Qt Project <[email protected]> | 2013-10-18 18:01:54 +0200 |
| commit | 4dab27933db18bda3d2a3272bf1f07f68aa80985 (patch) | |
| tree | f4bbbea1a50461f37ee4db5bb64dd31cb2ce1b1f | |
| parent | c4a51166f59416b8a5dc578079bf69097780a11b (diff) | |
Clear qt_tablet_target in ~QWidgetWindow.
Task-number: QTBUG-34007
Change-Id: If67563e5d9c4040256b58521773736e14db6fbaf
Reviewed-by: Laszlo Agocs <[email protected]>
| -rw-r--r-- | src/widgets/kernel/qwidgetwindow.cpp | 6 | ||||
| -rw-r--r-- | src/widgets/kernel/qwidgetwindow_qpa_p.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp index 668d5b0fc05..51a0eb7d727 100644 --- a/src/widgets/kernel/qwidgetwindow.cpp +++ b/src/widgets/kernel/qwidgetwindow.cpp @@ -86,6 +86,12 @@ QWidgetWindow::QWidgetWindow(QWidget *widget) connect(m_widget, &QObject::objectNameChanged, this, &QWidgetWindow::updateObjectName); } +QWidgetWindow::~QWidgetWindow() +{ + if (m_widget == qt_tablet_target) + qt_tablet_target = 0; +} + #ifndef QT_NO_ACCESSIBILITY QAccessibleInterface *QWidgetWindow::accessibleRoot() const { diff --git a/src/widgets/kernel/qwidgetwindow_qpa_p.h b/src/widgets/kernel/qwidgetwindow_qpa_p.h index 341aaba0d51..ffde44dd275 100644 --- a/src/widgets/kernel/qwidgetwindow_qpa_p.h +++ b/src/widgets/kernel/qwidgetwindow_qpa_p.h @@ -58,6 +58,7 @@ class QWidgetWindow : public QWindow Q_OBJECT public: QWidgetWindow(QWidget *widget); + ~QWidgetWindow(); QWidget *widget() const { return m_widget; } #ifndef QT_NO_ACCESSIBILITY |