Merge remote-tracking branch 'origin/11.0'

Change-Id: Idbf5f641aa9db7574cf2a4bd09adb8bcd03da894
2023-08-22 08:10:48 +02:00
parent 4e0c4b0f23 64b852e186
commit 5122d8addc
15 changed files with 206 additions and 47 deletions
--- a/src/plugins/cppeditor/cpprefactoringchanges.cpp
+++ b/src/plugins/cppeditor/cpprefactoringchanges.cpp
@@ -131,6 +131,9 @@ bool CppRefactoringFile::isCursorOn(unsigned tokenIndex) const

 bool CppRefactoringFile::isCursorOn(const AST *ast) const
 {
+    if (!ast)
+        return false;
+
    QTextCursor tc = cursor();
    int cursorBegin = tc.selectionStart();