diff options
author | Liang Qi <liang.qi@qt.io> | 2017-03-30 13:46:40 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-03-30 13:46:40 +0200 |
commit | c3cc73e3087db62a8427ff569abff1a8289dae83 (patch) | |
tree | 9839a823f220f57775a732658b8aab0fa4ba9be3 /src/quicktemplates2/qquickapplicationwindow.cpp | |
parent | 2e0cded94716430658d4afe3e0fdd6fe4cf6362c (diff) | |
parent | bc514fba81b67afb41ee91ea917352ad674630a5 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/imports/controls/RangeSlider.qml
Change-Id: I0b930583135f044cb690217c026e6a120b73fcb7
Diffstat (limited to 'src/quicktemplates2/qquickapplicationwindow.cpp')
-rw-r--r-- | src/quicktemplates2/qquickapplicationwindow.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp index c40db20b..d49c9b0e 100644 --- a/src/quicktemplates2/qquickapplicationwindow.cpp +++ b/src/quicktemplates2/qquickapplicationwindow.cpp @@ -317,6 +317,8 @@ QQuickApplicationWindow::QQuickApplicationWindow(QWindow *parent) QQuickApplicationWindow::~QQuickApplicationWindow() { Q_D(QQuickApplicationWindow); + d->setActiveFocusControl(nullptr); + disconnect(this, SIGNAL(activeFocusItemChanged()), this, SLOT(_q_updateActiveFocus())); if (d->header) QQuickItemPrivate::get(d->header)->removeItemChangeListener(d, QQuickItemPrivate::Geometry | QQuickItemPrivate::Visibility | QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight); |