diff options
author | The Qt Project <gerrit-noreply@qt-project.org> | 2024-04-26 09:33:23 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2024-04-26 09:33:23 +0000 |
commit | 925b224c6d75c36601f15d5eb309405bfcab92ca (patch) | |
tree | 8d87f7542b42c4c2d0df6ce664d28fa2dd092d10 /src/plugins | |
parent | 77a46dc82613caf3e67498c4fc12cb6a5f64bd68 (diff) | |
parent | dea0da7a8bb59be2e8fef698e07d20592ed24a3e (diff) |
Merge "Merge remote-tracking branch 'origin/13.0'"
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/debugger/lldb/lldbengine.cpp | 11 | ||||
-rw-r--r-- | src/plugins/languageclient/languageclientutils.cpp | 4 | ||||
-rw-r--r-- | src/plugins/qmljseditor/qmljseditordocument.cpp | 3 | ||||
-rw-r--r-- | src/plugins/texteditor/texteditor.cpp | 3 |
4 files changed, 18 insertions, 3 deletions
diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp index 0e53afad35..3d21f82ca2 100644 --- a/src/plugins/debugger/lldb/lldbengine.cpp +++ b/src/plugins/debugger/lldb/lldbengine.cpp @@ -30,6 +30,7 @@ #include <projectexplorer/runcontrol.h> +#include <utils/algorithm.h> #include <utils/environment.h> #include <utils/qtcprocess.h> #include <utils/processinterface.h> @@ -328,6 +329,16 @@ void LldbEngine::handleLldbStarted() runEngine(); }; runCommand(cmd3); + + // Execute post attach commands + QStringList commands = settings().gdbPostAttachCommands().split('\n'); + commands = Utils::filtered(commands, [](const QString line) { + const QString trimmed = line.trimmed(); + return !trimmed.isEmpty() && !trimmed.startsWith('#'); + }); + for (const QString &cmd : commands) { + executeDebuggerCommand(cmd); + } } else { notifyEngineSetupFailed(); } diff --git a/src/plugins/languageclient/languageclientutils.cpp b/src/plugins/languageclient/languageclientutils.cpp index 031b05c957..3df7622548 100644 --- a/src/plugins/languageclient/languageclientutils.cpp +++ b/src/plugins/languageclient/languageclientutils.cpp @@ -235,8 +235,8 @@ void updateEditorToolBar(Core::IEditor *editor) TextDocument *document = textEditor->textDocument(); Client *client = LanguageClientManager::clientForDocument(textEditor->textDocument()); - ClientExtras *extras = static_cast<ClientExtras *>( - widget->findChild<QObject *>(clientExtrasName, Qt::FindDirectChildrenOnly)); + ClientExtras *extras = dynamic_cast<ClientExtras *>( + widget->findChild<QObject *>(clientExtrasName, Qt::FindDirectChildrenOnly)); if (!extras) { if (!client) return; diff --git a/src/plugins/qmljseditor/qmljseditordocument.cpp b/src/plugins/qmljseditor/qmljseditordocument.cpp index 18a9c4d0f2..cef1aefcd2 100644 --- a/src/plugins/qmljseditor/qmljseditordocument.cpp +++ b/src/plugins/qmljseditor/qmljseditordocument.cpp @@ -750,6 +750,9 @@ static Utils::FilePath qmllsForFile(const Utils::FilePath &file, void QmlJSEditorDocumentPrivate::settingsChanged() { + if (q->isTemporary()) + return; + Utils::FilePath newQmlls = qmllsForFile(q->filePath(), ModelManagerInterface::instance()); if (m_qmllsStatus.qmllsPath == newQmlls) return; diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp index 7a8fa1edbc..92636e63cd 100644 --- a/src/plugins/texteditor/texteditor.cpp +++ b/src/plugins/texteditor/texteditor.cpp @@ -7471,7 +7471,8 @@ void TextEditorWidgetPrivate::handleBackspaceKey() } } } else if (typingSettings.m_smartBackspaceBehavior == TypingSettings::BackspaceUnindents) { - if (c.positionInBlock() > TabSettings::firstNonSpace(c.block().text())) { + if (c.positionInBlock() == 0 + || c.positionInBlock() > TabSettings::firstNonSpace(c.block().text())) { if (cursorWithinSnippet) c.beginEditBlock(); c.deletePreviousChar(); |