diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-09-30 12:57:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-30 14:43:02 +0200 |
| commit | 99cdd5fc67386fb3361299b9ec493e081043097d (patch) | |
| tree | 2c1d41d3d71f671f104e93b87bf11bdd169ba746 /src/widgets/kernel/qwidget.cpp | |
| parent | 86876744f07cbaa01daca6869b896741878c39a3 (diff) | |
| parent | 46201f0e82a7b1629adad196dfa8f7ff1cf4dffd (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/corelib/global/qrandom.cpp
src/corelib/io/qfileinfo.cpp
src/corelib/kernel/qeventdispatcher_win.cpp
src/corelib/kernel/qeventdispatcher_win_p.h
src/gui/text/qfontdatabase.cpp
src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
src/plugins/platforms/windows/qwindowsglcontext.cpp
src/testlib/qtestcase.cpp
Done-With: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Done-With: Edward Welbourne <edward.welbourne@qt.io>
Change-Id: I4893212471aa24be804c989a581810e2f714545c
Diffstat (limited to 'src/widgets/kernel/qwidget.cpp')
| -rw-r--r-- | src/widgets/kernel/qwidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index cf5a81c204..6889c2e9e5 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -6204,7 +6204,7 @@ void QWidget::setFocusProxy(QWidget * w) if (changingAppFocusWidget) { QWidget *newDeepestFocusProxy = d_func()->deepestFocusProxy(); - QApplicationPrivate::focus_widget = newDeepestFocusProxy ? newDeepestFocusProxy : this; + QApplicationPrivate::setFocusWidget(newDeepestFocusProxy ? newDeepestFocusProxy : this, Qt::NoFocusReason); } } |