diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-25 01:00:35 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-25 01:00:35 +0200 |
| commit | 35ec3b49e1b0e7c72643a4e5b835bff57762f8cb (patch) | |
| tree | 97bc6a16cca64905434647f810635cb143ad9aac /src/widgets/widgets | |
| parent | 8bd0e6709f733a4934f32b4bd455eb1a46ff02d6 (diff) | |
| parent | 2e94947c5602800b540fdabbb9c058a63f13e9d0 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I65e4457a218f333161e9e72735b62fc821475f45
Diffstat (limited to 'src/widgets/widgets')
| -rw-r--r-- | src/widgets/widgets/qwidgetresizehandler.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/widgets/widgets/qwidgetresizehandler.cpp b/src/widgets/widgets/qwidgetresizehandler.cpp index 45010d1768..7ed6f6d78d 100644 --- a/src/widgets/widgets/qwidgetresizehandler.cpp +++ b/src/widgets/widgets/qwidgetresizehandler.cpp @@ -192,6 +192,7 @@ bool QWidgetResizeHandler::eventFilter(QObject *o, QEvent *ee) keyPressEvent(static_cast<QKeyEvent *>(ee)); break; case QEvent::ShortcutOverride: + buttonDown &= ((QGuiApplication::mouseButtons() & Qt::LeftButton) != Qt::NoButton); if (buttonDown) { ee->accept(); return true; |