Merge remote-tracking branch 'origin/6.0' into 7.0

Change-Id: I72684fe4b0857e52a15ee83721f9d7975582a8d2
2022-01-26 09:25:05 +01:00
parent 9def720ef6 250738d858
commit be5fb98f1f
18 changed files with 200 additions and 224 deletions
--- a/src/plugins/texteditor/texteditor.cpp
+++ b/src/plugins/texteditor/texteditor.cpp
@@ -2984,7 +2984,7 @@ bool TextEditorWidget::event(QEvent *e)
                           && (ke->key() < Qt::Key_Escape));
            d->m_maybeFakeTooltipEvent = false;
        }
-        return true;
+        break;
    }
    case QEvent::ApplicationPaletteChange: {
        // slight hack: ignore palette changes