diff --git a/dist/copyright_template.txt b/dist/copyright_template.txt
index 974656016df..efdc4bcbe8d 100644
--- a/dist/copyright_template.txt
+++ b/dist/copyright_template.txt
@@ -1,3 +1,3 @@
-// Copyright (C) 2023 The Qt Company Ltd.
+// Copyright (C) %{CurrentDate:yyyy} The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
diff --git a/doc/qtcreator/config/style/qt5-sidebar.html b/doc/qtcreator/config/style/qt5-sidebar.html
index f048c0c6c35..340da73317c 100644
--- a/doc/qtcreator/config/style/qt5-sidebar.html
+++ b/doc/qtcreator/config/style/qt5-sidebar.html
@@ -15,6 +15,8 @@
     <div class="indexboxcont indexboxbar">
         <ul>
             <li><a href="creator-overview.html">Overview</a></li>
+            <li><a href="creator-quick-tour.html">User Interface</a></li>
+            <li><a href="creator-configuring.html">Configuring Qt Creator</a></li>
             <li><a href="creator-project-creating.html">Creating Projects</a></li>
             <li><a href="creator-configuring-projects.html">Configuring Projects</a></li>
             <li><a href="creator-debugging.html">Debugging</a></li>
diff --git a/doc/qtcreator/src/analyze/creator-heob.qdoc b/doc/qtcreator/src/analyze/creator-heob.qdoc
index 45f2b269ed6..33d9568c07b 100644
--- a/doc/qtcreator/src/analyze/creator-heob.qdoc
+++ b/doc/qtcreator/src/analyze/creator-heob.qdoc
@@ -9,7 +9,7 @@
 
 /*!
     \page creator-how-to-use-heob.html
-    \previouspage creator-clang-tools.html
+    \previouspage creator-how-tos.html
 
     \ingroup creator-how-to-analyze
 
diff --git a/doc/qtcreator/src/overview/creator-only/creator-reference.qdoc b/doc/qtcreator/src/overview/creator-only/creator-reference.qdoc
index 6f2ed53a14e..fa33afb2a41 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-reference.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-reference.qdoc
@@ -19,20 +19,6 @@
 
     \annotatedlist creator-reference-analyzer
 
-    \section1 Debuggers
-
-    Set up and use debuggers to debug executable binary files, as well as
-    QML, Java, and Python source code.
-
-    \annotatedlist creator-reference-debugger
-
-    \section2 Debugger Views
-
-    Inspect the state of your application while debugging in the
-    \uicontrol Debug mode.
-
-    \annotatedlist creator-reference-debugger-views
-
     \section1 Build Systems
 
     When you create projects, you can choose the build system to use for
@@ -50,6 +36,20 @@
 
     \annotatedlist creator-reference-build-configurations
 
+    \section1 Debuggers
+
+    Set up and use debuggers to debug executable binary files, as well as
+    QML, Java, and Python source code.
+
+    \annotatedlist creator-reference-debugger
+
+    \section2 Debugger Views
+
+    Inspect the state of your application while debugging in the
+    \uicontrol Debug mode.
+
+    \annotatedlist creator-reference-debugger-views
+
     \section1 Devices
 
     Connect devices to the computer to run, debug, and analyze applications
@@ -114,6 +114,8 @@
 
     \section2 Debugger
 
+    Preferences for debugging.
+
     \annotatedlist creator-reference-preferences-debugger
 
     \section2 Kits
diff --git a/qbs/imports/QtcPlugin.qbs b/qbs/imports/QtcPlugin.qbs
index d06f99385e4..f4ee221695f 100644
--- a/qbs/imports/QtcPlugin.qbs
+++ b/qbs/imports/QtcPlugin.qbs
@@ -46,6 +46,6 @@ QtcProduct {
     Export {
         Depends { name: "cpp" }
         Depends { name: "ExtensionSystem" }
-        cpp.includePaths: ".."
+        cpp.includePaths: exportingProduct.sourceDirectory + "/.."
     }
 }
diff --git a/share/qtcreator/qml-type-descriptions/qbs-bundle.json b/share/qtcreator/qml-type-descriptions/qbs-bundle.json
index 9b2f233a4c3..672c79187f2 100644
--- a/share/qtcreator/qml-type-descriptions/qbs-bundle.json
+++ b/share/qtcreator/qml-type-descriptions/qbs-bundle.json
@@ -24,6 +24,7 @@
         "qbs.Probes",
         "qbs.Process",
         "qbs.PropertyList",
+        "qbs.ProviderUtils",
         "qbs.TemporaryDir",
         "qbs.TextFile",
         "qbs.UnixUtils",
diff --git a/share/qtcreator/qml-type-descriptions/qbs.qmltypes b/share/qtcreator/qml-type-descriptions/qbs.qmltypes
index 941697b02d2..00c0cbb9261 100644
--- a/share/qtcreator/qml-type-descriptions/qbs.qmltypes
+++ b/share/qtcreator/qml-type-descriptions/qbs.qmltypes
@@ -19,7 +19,6 @@ Module {
         exports: [ "qbs/Depends 1.0" ]
         prototype: "QQuickItem"
         Property { name: "condition"; type: "bool" }
-        Property { name: "enableFallback"; type: "bool" }
         Property { name: "limitToSubProject"; type: "bool" }
         Property { name: "multiplexConfigurationIds"; type: "string"; isList: true }
         Property { name: "name"; type: "string" }
@@ -93,6 +92,8 @@ Module {
         name: "ModuleProvider"
         exports: [ "qbs/ModuleProvider 1.0" ]
         prototype: "QQuickItem"
+        Property { name: "isEager"; type: "bool" }
+        Property { name: "moduleName"; type: "string" }
         Property { name: "name"; type: "string" }
         Property { name: "outputBaseDir"; type: "string" }
         Property { name: "relativeSearchPaths"; type: "string"; isList: true }
diff --git a/share/qtcreator/templates/wizards/projects/consoleapp/main.cpp b/share/qtcreator/templates/wizards/projects/consoleapp/main.cpp
index 3609b36c4e1..356f567b8c3 100644
--- a/share/qtcreator/templates/wizards/projects/consoleapp/main.cpp
+++ b/share/qtcreator/templates/wizards/projects/consoleapp/main.cpp
@@ -22,5 +22,16 @@ int main(int argc, char *argv[])
     }
 @endif
 
+    // Set up code that uses the Qt event loop here.
+    // Call a.quit() or a.exit() to quit the application.
+    // A not very useful example would be including
+    // #include <QTimer>
+    // near the top of the file and calling
+    // QTimer::singleShot(5000, &a, &QCoreApplication::quit);
+    // which quits the application after 5 seconds.
+
+    // If you do not need a running Qt event loop, remove the call
+    // to a.exec() or use the Non-Qt Plain C++ Application template.
+
     return a.exec();
 }
diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index 9c18f5e66c7..64cb6774620 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -10765,7 +10765,7 @@ Locked components cannot be modified or selected.</source>
     </message>
     <message>
         <source>Verifying package integrity...</source>
-        <translation type="unfinished"></translation>
+        <translation>Prüfe die Integrität des Pakets...</translation>
     </message>
     <message>
         <source>Unarchiving error.</source>
@@ -10963,7 +10963,7 @@ Dies kann nicht rückgängig gemacht werden.</translation>
     </message>
     <message>
         <source>Android support is not yet configured.</source>
-        <translation type="unfinished"></translation>
+        <translation>Android-Unterstützung ist noch nicht konfiguriert.</translation>
     </message>
     <message>
         <source>The device info returned from AvdDialog is invalid.</source>
@@ -11169,11 +11169,11 @@ Dies kann nicht rückgängig gemacht werden.</translation>
     </message>
     <message>
         <source>Cannot find the package name from AndroidManifest.xml nor build.gradle files at &quot;%1&quot;.</source>
-        <translation type="unfinished"></translation>
+        <translation>Konnte den Paketnamen nicht aus den Informationen in der AndroidManifest.xml-Datei oder der build.gradle-Datei in &quot;%1&quot; bestimmen.</translation>
     </message>
     <message>
         <source>Deployment failed with the following errors:</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Deployment ist mit den folgenden Fehlern fehlgeschlagen:</translation>
     </message>
     <message>
         <source>Install an APK File</source>
@@ -11397,7 +11397,7 @@ Der vom Kit mindestens benötigte API-Level ist %1.</translation>
     </message>
     <message>
         <source>Cannot open &quot;%1&quot;.</source>
-        <translation type="unfinished"></translation>
+        <translation>&quot;%1&quot; kann nicht geöffnet werden.</translation>
     </message>
     <message>
         <source>Cannot parse &quot;%1&quot;.</source>
@@ -11599,39 +11599,39 @@ Installieren Sie diese manuell, nachdem der aktuelle Vorgang abgeschlossen ist.
     </message>
     <message>
         <source>Finished successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation>Erfolgreich abgeschlossen.</translation>
     </message>
     <message>
         <source>Installing / Uninstalling selected packages...</source>
-        <translation type="unfinished"></translation>
+        <translation>Installiere / Deinstalliere ausgewählte Pakete...</translation>
     </message>
     <message>
         <source>Closing the preferences dialog will cancel the running and scheduled SDK operations.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wenn Sie den Einstellungsdialog schließen, werden die laufenden und geplanten SDK-Operationen abgebrochen.</translation>
     </message>
     <message>
         <source>Closing the options dialog will cancel the running and scheduled SDK operations.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wenn Sie den Einstellungsdialog schließen, werden die laufenden und geplanten SDK-Operationen abgebrochen.</translation>
     </message>
     <message>
         <source>Uninstalling %1...</source>
-        <translation type="unfinished"></translation>
+        <translation>Deinstalliere %1...</translation>
     </message>
     <message>
         <source>Installing %1...</source>
-        <translation type="unfinished"></translation>
+        <translation>Installiere %1...</translation>
     </message>
     <message>
         <source>Updating installed packages...</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktualisiere installierte Pakete...</translation>
     </message>
     <message>
         <source>[Packages to be uninstalled:]</source>
-        <translation type="unfinished"></translation>
+        <translation>[Pakete, die deinstalliert werden sollen:]</translation>
     </message>
     <message>
         <source>[Packages to be installed:]</source>
-        <translation type="unfinished"></translation>
+        <translation>[Pakete, die installiert werden sollen:]</translation>
     </message>
     <message>
         <source>Android SDK Changes</source>
@@ -11720,7 +11720,7 @@ Installieren Sie diese manuell, nachdem der aktuelle Vorgang abgeschlossen ist.
     </message>
     <message>
         <source>Failed to start AVD emulator for &quot;%1&quot; device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Starten des AVD-Emulators für das Gerät &quot;%1&quot; ist fehlgeschlagen.</translation>
     </message>
     <message>
         <source>Clean Environment</source>
@@ -12340,11 +12340,11 @@ und das Überschreiben Ihrer Einstellungen erfordert. Das Überschreiben erlaube
     </message>
     <message>
         <source>Use a timeout while executing test cases.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeitlimit für das Ausführen von Testfällen verwenden.</translation>
     </message>
     <message>
         <source>Timeout used when executing test cases. This will apply for each test case on its own, not the whole project. Overrides test framework or build system defaults.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeitlimit, das für das Ausführen von Testfällen benutzt wird. Dieses wird für jeden Testfall einzeln angewendet, nicht für das gesamte Projekt. Überschreibt die Vorgaben des Test-Frameworks und des Build-Systems.</translation>
     </message>
     <message>
         <source>Omit run configuration warnings</source>
@@ -12494,23 +12494,23 @@ Warnung: Dies ist eine experimentelle Funktion und könnte dazu führen, dass di
     </message>
     <message>
         <source>Apply path filters before scanning for tests.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pfade vor dem Suchen nach Tests filtern.</translation>
     </message>
     <message>
         <source>Wildcard expressions for filtering:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausdrücke mit Platzhaltern, die zum Filtern benutzt werden:</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation type="unfinished">Hinzufügen</translation>
+        <translation>Hinzufügen</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Entfernen</translation>
     </message>
     <message>
         <source>Limit Files to Path Patterns</source>
-        <translation type="unfinished"></translation>
+        <translation>Dateien auf Suchmuster beschränken</translation>
     </message>
     <message>
         <source>Scanning for Tests</source>
@@ -13028,7 +13028,7 @@ Dies könnte Probleme während der Ausführung verursachen.
     </message>
     <message>
         <source>Repeat Tests</source>
-        <translation type="unfinished"></translation>
+        <translation>Tests wiederholen</translation>
     </message>
     <message>
         <source>Output on failure</source>
@@ -13728,7 +13728,7 @@ Siehe auch die Einstellungen für Google Test.</translation>
     </message>
     <message>
         <source>No Data</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine Daten</translation>
     </message>
     <message>
         <source>Axivion</source>
@@ -13744,15 +13744,15 @@ Siehe auch die Einstellungen für Google Test.</translation>
     </message>
     <message>
         <source>Open Issue in Dashboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Problem im Dashboard anzeigen</translation>
     </message>
     <message>
         <source>Open Table in Dashboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Tabelle im Dashboard anzeigen</translation>
     </message>
     <message>
         <source>Copy Dashboard Link to Clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Dashboard-Link in die Zwischenablage kopieren</translation>
     </message>
     <message>
         <source>Show rule details</source>
@@ -13792,7 +13792,7 @@ Hinweis: Dies macht Sie anfällig für Man-in-the-middle-Angriffe.</translation>
     </message>
     <message>
         <source>Unauthenticated access failed (wrong user), using authenticated access...</source>
-        <translation type="unfinished"></translation>
+        <translation>Zugriff ohne Authentifizierung ist fehlgeschlagen (falscher Benutzer), verwende authentifizierten Zugriff...</translation>
     </message>
     <message>
         <source>Enter the password for:
@@ -13830,7 +13830,7 @@ Wollen Sie &quot;%1&quot; mit der Standardanwendung öffnen?</translation>
     </message>
     <message>
         <source>Search for issues inside the Axivion dashboard or request issue details for Axivion inline annotations to see them here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Suchen Sie nach Problemen im Axivion-Dashboard oder fordern Sie Problemdetails für Inline-Annotationen von Axivion an, um sie hier anzuzeigen.</translation>
     </message>
     <message>
         <source>Fetch Projects</source>
@@ -13882,7 +13882,7 @@ Wollen Sie &quot;%1&quot; mit der Standardanwendung öffnen?</translation>
     </message>
     <message>
         <source>Add...</source>
-        <translation type="unfinished">Hinzufügen...</translation>
+        <translation>Hinzufügen...</translation>
     </message>
     <message>
         <source>Edit...</source>
@@ -13890,27 +13890,27 @@ Wollen Sie &quot;%1&quot; mit der Standardanwendung öffnen?</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Entfernen</translation>
     </message>
     <message>
         <source>Default dashboard server:</source>
-        <translation type="unfinished"></translation>
+        <translation>Vorgabe-Dashboardserver:</translation>
     </message>
     <message>
         <source>unset</source>
-        <translation type="unfinished"></translation>
+        <translation>nicht gesetzt</translation>
     </message>
     <message>
         <source>Remove Server Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Server-Konfiguration löschen</translation>
     </message>
     <message>
         <source>Remove the server configuration &quot;%1&quot;?</source>
-        <translation type="unfinished"></translation>
+        <translation>Server-Konfiguration &quot;%1&quot; löschen?</translation>
     </message>
     <message>
         <source>Add Dashboard Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Dashboard-Konfiguration hinzufügen</translation>
     </message>
     <message>
         <source>Edit Dashboard Configuration</source>
@@ -16270,7 +16270,7 @@ Zum Beispiel bewirkt die Angabe &quot;Revision: 15&quot; dass der Branch auf Rev
     </message>
     <message>
         <source>You may need to add the project directory to the list of directories that are mounted by the build device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie müssen das Projektverzeichnis möglicherweise zur Liste der vom Gerät eingehängten Pfade hinzufügen.</translation>
     </message>
     <message>
         <source>The source directory %1 is not reachable by the CMake executable %2.</source>
@@ -16310,7 +16310,7 @@ Zum Beispiel bewirkt die Angabe &quot;Revision: 15&quot; dass der Branch auf Rev
     </message>
     <message>
         <source>CMake Preset (%1) %2 Debugger</source>
-        <translation type="unfinished"></translation>
+        <translation>CMake-Preset (%1) %2 Debugger</translation>
     </message>
     <message>
         <source>Unexpected source directory &quot;%1&quot;, expected &quot;%2&quot;. This can be correct in some situations, for example when importing a standalone Qt test, but usually this is an error. Import the build anyway?</source>
@@ -16435,7 +16435,7 @@ Zum Beispiel bewirkt die Angabe &quot;Revision: 15&quot; dass der Branch auf Rev
     <message>
         <source>CMake project configuration failed. No CMake configuration for build type &quot;%1&quot; found. Check General Messages for more information.</source>
         <extracomment>General Messages refers to the output view</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Die CMake-Konfiguration des Projekts ist fehlgeschlagen. Es wurde keine CMake-Konfiguration für den Build-Typ &quot;%1&quot; gefunden. Überprüfen Sie &quot;Allgemeine Ausgaben&quot; für weitere Informationen.</translation>
     </message>
     <message>
         <source>No &quot;%1&quot; CMake configuration found. Available configurations: &quot;%2&quot;.
@@ -16475,15 +16475,15 @@ Stellen Sie sicher, dass der Wert der CMAKE_BUILD_TYPE-Variable derselbe wie der
     </message>
     <message>
         <source>Invalid &quot;configurePresets&quot; section in file &quot;%1&quot;.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ungültiger Abschnitt &quot;configurePresets&quot; in Datei &quot;%1&quot;.</translation>
     </message>
     <message>
         <source>Invalid &quot;buildPresets&quot; section in file &quot;%1&quot;.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ungültiger Abschnitt &quot;buildPresets&quot; in Datei &quot;%1&quot;.</translation>
     </message>
     <message>
         <source>Invalid &quot;vendor&quot; section in file &quot;%1&quot;.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ungültiger Abschnitt &quot;vendor&quot; in Datei &quot;%1&quot;.</translation>
     </message>
     <message>
         <source>&lt;File System&gt;</source>
@@ -16871,7 +16871,7 @@ Stellen Sie sicher, dass der Wert der CMAKE_BUILD_TYPE-Variable derselbe wie der
     </message>
     <message>
         <source>Generating Clang compilation database canceled.</source>
-        <translation type="unfinished"></translation>
+        <translation>Erzeugen der Clang-Kompilierungsdatenbank wurde abgebrochen.</translation>
     </message>
     <message>
         <source>Generate Compilation Database for &quot;%1&quot;</source>
@@ -16973,7 +16973,7 @@ Stellen Sie sicher, dass der Wert der CMAKE_BUILD_TYPE-Variable derselbe wie der
     </message>
     <message>
         <source>Cannot use clangd: Generating compilation database canceled.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kann Clangd nicht nutzen: Erstellen der Kompilierungsdatenbank wurde abgebrochen.</translation>
     </message>
     <message>
         <source>Cannot use clangd: Failed to generate compilation database:
@@ -17008,7 +17008,7 @@ Stellen Sie sicher, dass der Wert der CMAKE_BUILD_TYPE-Variable derselbe wie der
     </message>
     <message>
         <source>Could not retrieve project info.</source>
-        <translation type="unfinished"></translation>
+        <translation>Projekt-Information konnte nicht abgefragt werden.</translation>
     </message>
     <message>
         <source>Could not create &quot;%1&quot;: %2</source>
@@ -17194,11 +17194,11 @@ Ausgabe:
     </message>
     <message>
         <source>Suppress Selected Diagnostics Inline</source>
-        <translation type="unfinished"></translation>
+        <translation>Inline-Anzeige der ausgewählten Meldungen unterdrücken</translation>
     </message>
     <message>
         <source>Suppress This Diagnostic Inline</source>
-        <translation type="unfinished"></translation>
+        <translation>Inline-Anzeige dieser Meldung unterdrücken</translation>
     </message>
     <message>
         <source>Disable These Checks</source>
@@ -18677,17 +18677,17 @@ Der Code wurde in die Zwischenablage kopiert.</translation>
     <message>
         <source>Path to %1:</source>
         <extracomment>%1 is the filename of the copilot language server</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Pfad zu %1:</translation>
     </message>
     <message>
         <source>%1 path</source>
         <extracomment>%1 is the filename of the copilot language server</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Pfad zu %1</translation>
     </message>
     <message>
         <source>Select path to %2 in Copilot Neovim plugin. See %1 for installation instructions.</source>
         <extracomment>%1 is the URL to copilot.vim getting started, %2 is the filename of the copilot language server</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Wählen Sie den Pfad zu %2 im Copilot-Plugin für Neovim. Siehe auch %1 für eine Installationsanleitung.</translation>
     </message>
     <message>
         <source>Auto Request</source>
@@ -18786,7 +18786,9 @@ Der Code wurde in die Zwischenablage kopiert.</translation>
 
 Otherwise you need to specify the path to the %2 file from the Copilot neovim plugin.</source>
         <comment>Markdown text for the copilot instruction label</comment>
-        <translation type="unfinished"></translation>
+        <translation>Das Copilot-Plugin benötigt node.js und das Copilot-Plugin für Neovim. Wenn Sie das Neovim-Plugin wie in der %1 beschrieben installieren, findet das Plugin die Datei %3 automatisch.
+
+Ansonsten müssen Sie den Pfad zur Datei %2 aus dem Copilot-Plugin für Neovim angeben.</translation>
     </message>
     <message>
         <source>Note</source>
@@ -20157,11 +20159,11 @@ konnte nicht unter Versionsverwaltung (%2) gestellt werden
     <message>
         <source>output.txt</source>
         <extracomment>default file name suggested for saving text from output views</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>ausgabe.txt</translation>
     </message>
     <message>
         <source>Save Contents...</source>
-        <translation type="unfinished"></translation>
+        <translation>Inhalt speichern...</translation>
     </message>
     <message numerus="yes">
         <source>Elided %n characters due to Application Output settings</source>
@@ -20527,7 +20529,7 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeiche
     </message>
     <message>
         <source>Locator filters show relative paths to the active project when possible.</source>
-        <translation type="unfinished"></translation>
+        <translation>Locator-Filter zeigen relative Pfade zum aktiven Projekt an, wenn möglich.</translation>
     </message>
     <message>
         <source>Files in Directories</source>
@@ -20997,7 +20999,7 @@ Möchten Sie es beenden?</translation>
     </message>
     <message>
         <source>The path to the running %1 itself.</source>
-        <translation type="unfinished"></translation>
+        <translation>Der Pfad zum laufenden %1 selbst.</translation>
     </message>
     <message>
         <source>The directory where %1 finds its pre-installed resources.</source>
@@ -21005,7 +21007,7 @@ Möchten Sie es beenden?</translation>
     </message>
     <message>
         <source>The directory where %1 puts custom user data.</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Verzeichnis, in dem %1 Benutzerdaten speichert.</translation>
     </message>
     <message>
         <source>The current date (QDate formatstring).</source>
@@ -21245,7 +21247,7 @@ Möchten Sie sie jetzt auschecken?</translation>
     </message>
     <message>
         <source>Reopen Last Closed Document</source>
-        <translation type="unfinished"></translation>
+        <translation>Zuletzt geschlossenes Dokument erneut öffnen</translation>
     </message>
     <message>
         <source>Meta+E,2</source>
@@ -23003,11 +23005,11 @@ Namensraum-Definition</translation>
     </message>
     <message>
         <source>Macros that can be used as statements without a trailing semicolon.</source>
-        <translation type="unfinished"></translation>
+        <translation>Makros, die ohne abschließendes Semikolon benutzt werden können.</translation>
     </message>
     <message>
         <source>Statement Macros</source>
-        <translation type="unfinished"></translation>
+        <translation>Anweisungs-Makros</translation>
     </message>
     <message>
         <source>Braces</source>
@@ -23274,15 +23276,15 @@ Diese Präfixe werden zusätzlich zum Dateinamen beim Wechseln zwischen Header-
     </message>
     <message>
         <source>Header File Variables</source>
-        <translation type="unfinished"></translation>
+        <translation>Variablen für Header-Dateien</translation>
     </message>
     <message>
         <source>Header file</source>
-        <translation type="unfinished"></translation>
+        <translation>Header-Datei</translation>
     </message>
     <message>
         <source>Use &quot;#pragma once&quot; instead</source>
-        <translation type="unfinished"></translation>
+        <translation>Stattdessen &quot;#pragma once&quot; benutzen</translation>
     </message>
     <message>
         <source>&amp;Lower case file names</source>
@@ -23290,7 +23292,7 @@ Diese Präfixe werden zusätzlich zum Dateinamen beim Wechseln zwischen Header-
     </message>
     <message>
         <source>Include guard template:</source>
-        <translation type="unfinished"></translation>
+        <translation>Vorlage für Include-Guards:</translation>
     </message>
     <message>
         <source>License &amp;template:</source>
@@ -23727,11 +23729,11 @@ z.B. name = &quot;m_test_foo_&quot;:
     </message>
     <message>
         <source>Enable indexing</source>
-        <translation type="unfinished"></translation>
+        <translation>Indizieren aktivieren</translation>
     </message>
     <message>
         <source>Indexing should almost always be kept enabled, as disabling it will severely limit the capabilities of the code model.</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Indizieren sollte nahezu immer aktiviert bleiben, da das Deaktivieren die Fähigkeiten des Codemodells erheblich einschränkt.</translation>
     </message>
     <message>
         <source>Do not index files greater than</source>
@@ -23775,11 +23777,11 @@ z.B. name = &quot;m_test_foo_&quot;:
     </message>
     <message>
         <source>The location of the per-project clangd index.&lt;p&gt;This is also where the compile_commands.json file will go.</source>
-        <translation type="unfinished"></translation>
+        <translation>Der Pfad zum Clangd-Index pro Projekt.&lt;p&gt;Dies ist auch der Ort, an dem die compile_commands.json-Datei gespeichert wird.</translation>
     </message>
     <message>
         <source>The location of the per-session clangd index.&lt;p&gt;This is also where the compile_commands.json file will go.</source>
-        <translation type="unfinished"></translation>
+        <translation>Der Pfad zum Clangd-Index pro Sitzung.&lt;p&gt;Dies ist auch der Ort, an dem die compile_commands.json-Datei gespeichert wird.</translation>
     </message>
     <message>
         <source>&lt;p&gt;The C/C++ backend to use for switching between header and source files.&lt;/p&gt;&lt;p&gt;While the clangd implementation has more capabilities than the built-in code model, it tends to find false positives.&lt;/p&gt;&lt;p&gt;When &quot;Try Both&quot; is selected, clangd is used only if the built-in variant does not find anything.&lt;/p&gt;</source>
@@ -23799,7 +23801,7 @@ z.B. name = &quot;m_test_foo_&quot;:
     </message>
     <message>
         <source>&lt;p&gt;Controls whether when editing a header file, clangd should re-parse all source files including that header.&lt;/p&gt;&lt;p&gt;Note that enabling this option can cause considerable CPU load when editing widely included headers.&lt;/p&gt;&lt;p&gt;If this option is disabled, the dependent source files are only re-parsed when the header file is saved.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Bestimmt, ob Clangd beim Bearbeiten einer Header-Datei alle Quelldateien, die diesen Header benutzen, neu auswerten soll.&lt;/p&gt;&lt;p&gt;Beachten Sie, dass das Aktivieren dieser Einstellung erhebliche Prozessorauslastung beim Bearbeiten weitgenutzter Header-Dateien zur Folge haben kann.&lt;/p&gt;&lt;p&gt;Wenn diese Einstellung deaktiviert ist, werden abhängige Quelldateien erst erneut ausgewertet, wenn die Header-Datei gespeichert wird.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Defines the amount of time %1 waits before sending document changes to the server.
@@ -23827,7 +23829,7 @@ Das integrierte Codemodell übernimmt Syntaxhervorhebung, Code-Vervollständigun
     </message>
     <message>
         <source>Update dependent sources</source>
-        <translation type="unfinished"></translation>
+        <translation>Abhängige Quellen aktualisieren</translation>
     </message>
     <message>
         <source>Automatic</source>
@@ -23855,11 +23857,11 @@ Das integrierte Codemodell übernimmt Syntaxhervorhebung, Code-Vervollständigun
     </message>
     <message>
         <source>Per-project index location:</source>
-        <translation type="unfinished"></translation>
+        <translation>Pfad des Index pro Projekt:</translation>
     </message>
     <message>
         <source>Per-session index location:</source>
-        <translation type="unfinished"></translation>
+        <translation>Pfad des Index pro Sitzung:</translation>
     </message>
     <message>
         <source>Header/source switch mode:</source>
@@ -24227,40 +24229,41 @@ Flags: %3</translation>
     </message>
     <message>
         <source>Convert Function Call to Qt Meta-Method Invocation</source>
-        <translation type="unfinished"></translation>
+        <translation>Funktionsaufruf in Qt Meta-Methodenaufruf umwandeln</translation>
     </message>
     <message>
         <source>Move Class to a Dedicated Set of Source Files</source>
-        <translation type="unfinished"></translation>
+        <translation>Klasse in dedizierten Satz Quelldateien verschieben</translation>
     </message>
     <message>
         <source>Header file only</source>
-        <translation type="unfinished"></translation>
+        <translation>Nur Header-Datei</translation>
     </message>
     <message>
         <source>Project:</source>
-        <translation type="unfinished">Projekt:</translation>
+        <translation>Projekt:</translation>
     </message>
     <message>
         <source>Header file:</source>
-        <translation type="unfinished">Header-Datei:</translation>
+        <translation>Header-Datei:</translation>
     </message>
     <message>
         <source>Implementation file:</source>
-        <translation type="unfinished"></translation>
+        <translation>Implementationsdatei:</translation>
     </message>
     <message>
         <source>Refusing to overwrite the following files: %1
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Folgende Dateien existieren und werden nicht überschrieben: %1
+</translation>
     </message>
     <message>
         <source>Failed to add to project file &quot;%1&quot;: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Hinzufügen zur Projektdatei &quot;%1&quot; fehlgeschlagen: %2</translation>
     </message>
     <message>
         <source>Re-order Member Function Definitions According to Declaration Order</source>
-        <translation type="unfinished"></translation>
+        <translation>Definitionen der Memberfunktionen entsprechend der Deklarationsreihenfolge anordnen</translation>
     </message>
 </context>
 <context>
@@ -24914,11 +24917,11 @@ Möchten Sie die Daten trotzdem anzeigen?</translation>
     </message>
     <message>
         <source>Disable All Breakpoints</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle Haltepunkte deaktivieren</translation>
     </message>
     <message>
         <source>Enable All Breakpoints</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle Haltepunkte aktivieren</translation>
     </message>
     <message>
         <source>Disable Selected Locations</source>
@@ -25747,15 +25750,15 @@ markers in the source code editor.</source>
     </message>
     <message>
         <source>Use debug info daemon</source>
-        <translation type="unfinished"></translation>
+        <translation>Debuginfo-Daemon benutzen</translation>
     </message>
     <message>
         <source>Use system settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Systemeinstellungen benutzen</translation>
     </message>
     <message>
         <source>Lets GDB attempt to automatically retrieve debug information for system packages.</source>
-        <translation type="unfinished"></translation>
+        <translation>Lässt GDB versuchen, die Debuginformation für Systempakete automatisch abzurufen.</translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enables stepping backwards.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This feature is very slow and unstable on the GDB side. It exhibits unpredictable behavior when going backwards over system calls and is very likely to destroy your debugging session.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -26626,7 +26629,7 @@ markers in the source code editor.</source>
     </message>
     <message>
         <source>&quot;%1&quot; could not be started. Error message: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>&quot;%1&quot; konnte nicht gestartet werden. Fehlermeldung: %2</translation>
     </message>
     <message>
         <source>Python Error</source>
@@ -27152,7 +27155,7 @@ Sie werden möglicherweise gebeten, den Inhalt dieses Logs mitzuteilen, wenn Sie
     </message>
     <message>
         <source>LLDB Preset</source>
-        <translation type="unfinished"></translation>
+        <translation>LLDB Voreinstellung</translation>
     </message>
     <message>
         <source>Python Preset</source>
@@ -27950,7 +27953,7 @@ Sie können hier eine andere Verbindung wählen, beispielsweise eine serielle Ve
     </message>
     <message>
         <source>Behavior</source>
-        <translation type="unfinished">Verhalten</translation>
+        <translation>Verhalten</translation>
     </message>
     <message>
         <source>Extra Debugging Helpers</source>
@@ -28224,7 +28227,7 @@ Bitte wählen Sie einen 64-bit-Debugger in den Kit-Einstellungen für dieses Kit
     </message>
     <message>
         <source>Launching %1 Debugger</source>
-        <translation type="unfinished"></translation>
+        <translation>Starte Debugger %1</translation>
     </message>
     <message>
         <source>Loading finished.</source>
@@ -29984,102 +29987,102 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
     <name>QtC::ExtensionManager</name>
     <message>
         <source>Extensions</source>
-        <translation type="unfinished"></translation>
+        <translation>Erweiterungen</translation>
     </message>
     <message>
         <source>More information</source>
-        <translation type="unfinished"></translation>
+        <translation>Mehr Informationen</translation>
     </message>
     <message>
         <source>Extension details</source>
-        <translation type="unfinished"></translation>
+        <translation>Erweiterungsdetails</translation>
     </message>
     <message numerus="yes">
         <source>Pack contains %n plugins.</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>Paket enthält ein Plugin.</numerusform>
+            <numerusform>Paket enthält %n Plugins.</numerusform>
         </translation>
     </message>
     <message>
         <source>Load on start</source>
-        <translation type="unfinished"></translation>
+        <translation>Beim Start laden</translation>
     </message>
     <message>
         <source>Restart Now</source>
-        <translation type="unfinished">Jetzt neu starten</translation>
+        <translation>Jetzt neu starten</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished">Fehler</translation>
+        <translation>Fehler</translation>
     </message>
     <message>
         <source>Loaded</source>
-        <translation type="unfinished">Geladen</translation>
+        <translation>Geladen</translation>
     </message>
     <message>
         <source>Not loaded</source>
-        <translation type="unfinished"></translation>
+        <translation>Nicht geladen</translation>
     </message>
     <message>
         <source>Tags</source>
-        <translation type="unfinished">Tags</translation>
+        <translation>Tags</translation>
     </message>
     <message>
         <source>Platforms</source>
-        <translation type="unfinished"></translation>
+        <translation>Plattformen</translation>
     </message>
     <message>
         <source>Dependencies</source>
-        <translation type="unfinished">Abhängigkeiten</translation>
+        <translation>Abhängigkeiten</translation>
     </message>
     <message>
         <source>Extensions in pack</source>
-        <translation type="unfinished"></translation>
+        <translation>Erweiterungen im Paket</translation>
     </message>
     <message>
         <source>Downloading...</source>
-        <translation type="unfinished"></translation>
+        <translation>Lade herunter...</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
+        <translation>Abbrechen</translation>
     </message>
     <message>
         <source>Download Extension</source>
-        <translation type="unfinished"></translation>
+        <translation>Erweiterung herunterladen</translation>
     </message>
     <message>
         <source>Download Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Ladefehler</translation>
     </message>
     <message>
         <source>Cannot download extension</source>
-        <translation type="unfinished"></translation>
+        <translation>Erweiterung kann nicht heruntergeladen werden</translation>
     </message>
     <message>
         <source>Code: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Code: %1.</translation>
     </message>
     <message>
         <source>Manage Extensions</source>
-        <translation type="unfinished"></translation>
+        <translation>Erweiterungen verwalten</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="unfinished">Suche</translation>
+        <translation>Suche</translation>
     </message>
     <message>
         <source>Install...</source>
-        <translation type="unfinished"></translation>
+        <translation>Installieren...</translation>
     </message>
     <message>
         <source>Use external repository</source>
-        <translation type="unfinished"></translation>
+        <translation>Externes Repository benutzen</translation>
     </message>
     <message>
         <source>Repository: %1</source>
-        <translation type="unfinished">Repository: %1</translation>
+        <translation>Repository: %1</translation>
     </message>
 </context>
 <context>
@@ -30118,7 +30121,7 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
     </message>
     <message>
         <source>Loadable without restart:</source>
-        <translation type="unfinished"></translation>
+        <translation>Kann ohne Neustart geladen werden:</translation>
     </message>
     <message>
         <source>Plugin Details of %1</source>
@@ -30286,7 +30289,7 @@ Grund: %3</translation>
     </message>
     <message>
         <source>Cannot open file</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei kann nicht geöffnet werden</translation>
     </message>
     <message>
         <source>&quot;%1&quot; is missing</source>
@@ -30314,11 +30317,11 @@ Grund: %3</translation>
     </message>
     <message>
         <source>No IID found</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine IID gefunden</translation>
     </message>
     <message>
         <source>Expected IID &quot;%1&quot;, but found &quot;%2&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>IID &quot;%1&quot; erwartet, aber &quot;%2&quot; gefunden</translation>
     </message>
     <message>
         <source>Resolving dependencies failed because state != Read</source>
@@ -30390,7 +30393,7 @@ Grund: %3</translation>
     </message>
     <message>
         <source>Load on Startup</source>
-        <translation>Beim Start Laden</translation>
+        <translation>Beim Start laden</translation>
     </message>
     <message>
         <source>Utilities</source>
@@ -30444,7 +30447,7 @@ Plugin durch ein Kommandozeilenargument deaktiviert.</translation>
     </message>
     <message>
         <source>Load on startup</source>
-        <translation>Beim Start Laden</translation>
+        <translation>Beim Start laden</translation>
     </message>
     <message>
         <source>Enabling Plugins</source>
@@ -35076,7 +35079,7 @@ Möchten Sie sie überschreiben?</translation>
     </message>
     <message>
         <source>Product type:</source>
-        <translation type="unfinished"></translation>
+        <translation>Produkttyp:</translation>
     </message>
     <message>
         <source>Device name</source>
@@ -35109,7 +35112,7 @@ Möchten Sie sie überschreiben?</translation>
     </message>
     <message>
         <source>Product type</source>
-        <translation type="unfinished"></translation>
+        <translation>Produkttyp</translation>
     </message>
     <message>
         <source>An iOS device in user mode has been detected.</source>
@@ -35178,7 +35181,7 @@ Möchten Sie sie überschreiben?</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktualisieren</translation>
     </message>
     <message>
         <source>iOS Simulator</source>
@@ -35274,7 +35277,7 @@ Möchten Sie sie überschreiben?</translation>
     </message>
     <message>
         <source>Configure available simulator devices in &lt;a href=&quot;%1&quot;&gt;Xcode&lt;/a&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfigurieren Sie verfügbare Simulator-Geräte in &lt;a href=&quot;%1&quot;&gt;Xcode&lt;/a&gt;.</translation>
     </message>
     <message>
         <source>Devices</source>
@@ -35623,7 +35626,7 @@ Beispiel: *.cpp%1*.h</translation>
     </message>
     <message>
         <source>File pattern:</source>
-        <translation type="unfinished"></translation>
+        <translation>Suchmuster für Dateinamen:</translation>
     </message>
     <message>
         <source>Executable:</source>
@@ -35767,11 +35770,11 @@ Für gültige Einstellungen schauen Sie in die Dokumentation des verwendeten Lan
     </message>
     <message>
         <source>Language Server Diagnostics</source>
-        <translation type="unfinished"></translation>
+        <translation>Language Server-Meldungen</translation>
     </message>
     <message>
         <source>Issues provided by the Language Server in the current document.</source>
-        <translation type="unfinished"></translation>
+        <translation>Probleme, die der Language Server im aktuellen Dokument gefunden hat.</translation>
     </message>
     <message>
         <source>Always On</source>
@@ -35880,7 +35883,7 @@ Für gültige Einstellungen schauen Sie in die Dokumentation des verwendeten Lan
     </message>
     <message>
         <source>Deprecated</source>
-        <translation type="unfinished"></translation>
+        <translation>Veraltet</translation>
     </message>
     <message>
         <source>Incoming</source>
@@ -35892,11 +35895,11 @@ Für gültige Einstellungen schauen Sie in die Dokumentation des verwendeten Lan
     </message>
     <message>
         <source>Bases</source>
-        <translation type="unfinished">Basisklassen</translation>
+        <translation>Basistypen</translation>
     </message>
     <message>
         <source>Derived</source>
-        <translation type="unfinished">Abgeleitet</translation>
+        <translation>Abgeleitet</translation>
     </message>
     <message>
         <source>Call Hierarchy</source>
@@ -35950,129 +35953,134 @@ Für gültige Einstellungen schauen Sie in die Dokumentation des verwendeten Lan
     <name>QtC::Lua</name>
     <message>
         <source>Network Access</source>
-        <translation type="unfinished"></translation>
+        <translation>Netzwerkzugriff</translation>
     </message>
     <message>
         <source>Allow Internet Access</source>
-        <translation type="unfinished"></translation>
+        <translation>Internetzugriff erlauben</translation>
     </message>
     <message>
         <source>Allow the extension &quot;%1&quot; to fetch from the following URL:
 %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Der Erweiterung &quot;%1&quot; erlauben, auf folgende URL zuzugreifen:
+%2</translation>
     </message>
     <message>
         <source>Remember choice</source>
-        <translation type="unfinished"></translation>
+        <translation>Auswahl speichern</translation>
     </message>
     <message>
         <source>Allow the extension &quot;%1&quot; to fetch data from the internet?</source>
-        <translation type="unfinished"></translation>
+        <translation>Der Erweiterung &quot;%1&quot; erlauben, Daten aus dem Internet zu laden?</translation>
     </message>
     <message>
         <source>Allow the extension &quot;%1&quot; to fetch datafrom the following URL:
 
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Der Erweiterung &quot;%1&quot; erlauben, Daten von der folgenden URL zu laden:
+
+</translation>
     </message>
     <message>
         <source>Always Allow</source>
-        <translation type="unfinished"></translation>
+        <translation>Immer erlauben</translation>
     </message>
     <message>
         <source>Allow Once</source>
-        <translation type="unfinished"></translation>
+        <translation>Einmal erlauben</translation>
     </message>
     <message>
         <source>Deny</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbieten</translation>
     </message>
     <message>
         <source>Fetching is not allowed for the extension &quot;%1&quot;. (You can edit permissions in Preferences &gt; Lua.)</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Laden von Daten ist der Erweiterung &quot;%1&quot; nicht erlaubt. (Sie können die Rechte in Einstellungen &gt; Lua ändern.)</translation>
     </message>
     <message>
         <source>Package info is not an object.</source>
-        <translation type="unfinished"></translation>
+        <translation>Paketinformation ist kein Objekt.</translation>
     </message>
     <message>
         <source>Installed package info is not an object.</source>
-        <translation type="unfinished"></translation>
+        <translation>Installierte Paketinformation ist kein Objekt.</translation>
     </message>
     <message>
         <source>Cannot create app data directory.</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Verzeichnis für Anwendungsdaten konnte nicht angelegt werden.</translation>
     </message>
     <message>
         <source>Cannot write to package info: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Paketinformation konnte nicht geschrieben werden: %1</translation>
     </message>
     <message>
         <source>Cannot write to temporary file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Temporäre Datei konnte nicht geschrieben werden.</translation>
     </message>
     <message>
         <source>Unarchiving failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Entpacken fehlgeschlagen.</translation>
     </message>
     <message>
         <source>Cannot open temporary file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Temporäre Datei konnte nicht geöffnet werden.</translation>
     </message>
     <message>
         <source>Installing package(s) %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Installiere Paket(e) %1</translation>
     </message>
     <message>
         <source>Install Package</source>
-        <translation type="unfinished"></translation>
+        <translation>Installiere Paket</translation>
     </message>
     <message>
         <source>The extension &quot;%1&quot; wants to install the following package(s):
 
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Die Erweiterung &quot;%1&quot; möchte folgende Pakete installieren:
+
+</translation>
     </message>
     <message>
         <source>Install</source>
-        <translation type="unfinished">Installieren</translation>
+        <translation>Installieren</translation>
     </message>
     <message>
         <source>* %1 - %2 (from: [%3](%3))</source>
         <extracomment>Markdown list item: %1 = package name, %2 = version, %3 = URL</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>* %1 - %2 (von: [%3](%3))</translation>
     </message>
     <message>
         <source>Failed to run script %1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Ausführen des Skripts %1 ist fehlgeschlagen: %2</translation>
     </message>
     <message>
         <source>No hook with the name &quot;%1&quot; found.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kein Einsprungpunkt mit dem Namen &quot;%1&quot; gefunden.</translation>
     </message>
     <message>
         <source>Script did not return a table.</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Skript hat keine Tabelle zurückgeliefert.</translation>
     </message>
     <message>
         <source>Extension info table did not contain a setup function.</source>
-        <translation type="unfinished"></translation>
+        <translation>Informationstabelle der Erweiterung enthält keine Setup-Funktion.</translation>
     </message>
     <message>
         <source>Failed to load plugin %1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Laden des Plugins %1 ist fehlgeschlagen: %2</translation>
     </message>
     <message>
         <source>Cannot prepare extension setup: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Setup der Erweiterung kann nicht vorbereitet werden: %1</translation>
     </message>
     <message>
         <source>Extension setup function returned false.</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Setup-Funktion der Erweiterung hat &quot;false&quot; zurückgeliefert.</translation>
     </message>
     <message>
         <source>Extension setup function returned error: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Setup-Funktion der Erweiterung hat einen Fehler zurückgeliefert: %1</translation>
     </message>
 </context>
 <context>
@@ -37254,11 +37262,11 @@ Dies ist hilfreich, wenn das Build-Verzeichnis beschädigt ist oder das Projekt
     </message>
     <message>
         <source>Toggle View and Filter Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Einstellungen für Ansicht und Filter umschalten</translation>
     </message>
     <message>
         <source>Ctrl+Shift+L</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Shift+L</translation>
     </message>
     <message>
         <source>Synchronize Browser and Diagram</source>
@@ -37403,15 +37411,15 @@ Dies ist hilfreich, wenn das Build-Verzeichnis beschädigt ist oder das Projekt
     </message>
     <message>
         <source>Add Package Link to %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Paket-Link zu %1 hinzufügen</translation>
     </message>
     <message>
         <source>Add Diagram Link to %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Diagramm-Link zu %1 hinzufügen</translation>
     </message>
     <message>
         <source>Add Document Link to %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Dokument-Link zu %1 hinzufügen</translation>
     </message>
     <message>
         <source>Add Package %1</source>
@@ -37443,19 +37451,19 @@ Dies ist hilfreich, wenn das Build-Verzeichnis beschädigt ist oder das Projekt
     </message>
     <message>
         <source>Select File Target</source>
-        <translation type="unfinished"></translation>
+        <translation>Zieldatei auswählen</translation>
     </message>
     <message>
         <source>Linked file:</source>
-        <translation type="unfinished"></translation>
+        <translation>Verlinkte Datei:</translation>
     </message>
     <message>
         <source>Select Image File</source>
-        <translation type="unfinished"></translation>
+        <translation>Bilddatei auswählen</translation>
     </message>
     <message>
         <source>Image:</source>
-        <translation type="unfinished"></translation>
+        <translation>Bild:</translation>
     </message>
     <message>
         <source>&lt;font color=red&gt;Model file must be reloaded.&lt;/font&gt;</source>
@@ -37463,11 +37471,11 @@ Dies ist hilfreich, wenn das Build-Verzeichnis beschädigt ist oder das Projekt
     </message>
     <message>
         <source>Selecting Image</source>
-        <translation type="unfinished"></translation>
+        <translation>Bild auswählen</translation>
     </message>
     <message>
         <source>Unable to read image file &quot;%1&quot;.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bilddatei &quot;%1&quot; konnte nicht gelesen werden.</translation>
     </message>
     <message>
         <source>Zoom: %1%</source>
@@ -37475,15 +37483,15 @@ Dies ist hilfreich, wenn das Build-Verzeichnis beschädigt ist oder das Projekt
     </message>
     <message>
         <source>Opening File</source>
-        <translation type="unfinished"></translation>
+        <translation>Öffne Datei</translation>
     </message>
     <message>
         <source>File &quot;%1&quot; does not exist.</source>
-        <translation type="unfinished">Datei &quot;%1&quot; existiert nicht.</translation>
+        <translation>Datei &quot;%1&quot; existiert nicht.</translation>
     </message>
     <message>
         <source>Add Related Elements...</source>
-        <translation type="unfinished"></translation>
+        <translation>Zugehörige Elemente hinzufügen...</translation>
     </message>
     <message>
         <source>Update Include Dependencies</source>
@@ -38970,7 +38978,7 @@ Außer: %2
     <message>
         <source>compile-output.txt</source>
         <extracomment>file name suggested for saving compile output</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>kompilierungsausgabe.txt</translation>
     </message>
     <message>
         <source>Show Compile &amp;Output</source>
@@ -39330,7 +39338,7 @@ Title of a the cloned RunConfiguration window, text of the window</extracomment>
     </message>
     <message>
         <source>Open Workspace...</source>
-        <translation type="unfinished"></translation>
+        <translation>Workspace öffnen...</translation>
     </message>
     <message>
         <source>Open File</source>
@@ -39656,7 +39664,7 @@ Bitte versuchen Sie es erneut.</translation>
     </message>
     <message>
         <source>Open Workspace</source>
-        <translation type="unfinished"></translation>
+        <translation>Workspace öffnen</translation>
     </message>
     <message>
         <source>Sanitizer</source>
@@ -40314,19 +40322,19 @@ Rename %2 to %3 anyway?</source>
     </message>
     <message>
         <source>No build device is set for the kit &quot;%1&quot;.</source>
-        <translation type="unfinished"></translation>
+        <translation>Es ist kein Gerät (Erstellung) für das Kit &quot;%1&quot; eingerichtet.</translation>
     </message>
     <message>
         <source>You can try mounting the folder in your device settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie können in den Geräteeinstellungen versuchen, das Verzeichnis einzuhängen.</translation>
     </message>
     <message>
         <source>The build device &quot;%1&quot; cannot reach the project directory.</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Gerät &quot;%1&quot; für das Erstellen kann das Projektverzeichnis nicht erreichen.</translation>
     </message>
     <message>
         <source>The build device &quot;%1&quot; cannot reach the build directory.</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Gerät &quot;%1&quot; für das Erstellen kann das Build-Verzeichnis nicht erreichen.</translation>
     </message>
     <message>
         <source>Default</source>
@@ -40619,7 +40627,7 @@ Aktivieren Sie dies, wenn Sie 32bit-x86-Binärdateien erstellen wollen, ohne ein
     <message>
         <source>application-output-%1.txt</source>
         <extracomment>file name suggested for saving application output, %1 = run configuration display name</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>anwendungsausgabe-%1.txt</translation>
     </message>
     <message>
         <source>Application Output</source>
@@ -42975,7 +42983,8 @@ Sie sollten nicht mehrere Test-Frameworks im selben Projekt mischen.</translatio
     <message>
         <source>* Did not find a JSON object in &quot;%1&quot;.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>* Konnte kein JSON-Objekt in &quot;%1&quot; finden.
+</translation>
     </message>
     <message>
         <source>* Version %1 not supported.</source>
@@ -43132,7 +43141,7 @@ Sie sollten nicht mehrere Test-Frameworks im selben Projekt mischen.</translatio
     <message>
         <source>%1: Full path to Project Directory.</source>
         <extracomment>%1 is something like &quot;Active project&quot;</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>%1: Vollständiger Pfad zum Projektverzeichnis.</translation>
     </message>
     <message>
         <source>%1: The name of the active kit.</source>
@@ -43487,11 +43496,11 @@ Sie werden erhalten.</numerusform>
     </message>
     <message>
         <source>Show All Kits</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle Kits anzeigen</translation>
     </message>
     <message>
         <source>Hide Inactive Kits</source>
-        <translation type="unfinished"></translation>
+        <translation>Inaktive Kits verbergen</translation>
     </message>
     <message>
         <source>Enable Kit for Project &quot;%1&quot;</source>
@@ -43688,11 +43697,11 @@ Was soll %1 tun?</translation>
     </message>
     <message>
         <source>Emulator</source>
-        <translation type="unfinished">Emulator</translation>
+        <translation>Emulator</translation>
     </message>
     <message>
         <source>Launcher:</source>
-        <translation type="unfinished"></translation>
+        <translation>Startprogramm:</translation>
     </message>
     <message>
         <source>X11 Forwarding:</source>
@@ -44148,11 +44157,11 @@ Was soll %1 tun?</translation>
     <message>
         <source>s</source>
         <extracomment>Suffix for &quot;seconds&quot;</extracomment>
-        <translation type="unfinished">s</translation>
+        <translation>s</translation>
     </message>
     <message>
         <source>The amount of seconds to wait between a &quot;soft kill&quot; and a &quot;hard kill&quot; of a running application.</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Zeit in Sekunden, die zwischen einem &quot;soft kill&quot; und einem &quot;hard kill&quot; einer laufenden Anwendung gewartet werden soll.</translation>
     </message>
     <message>
         <source>Current directory</source>
@@ -44252,11 +44261,11 @@ Was soll %1 tun?</translation>
     </message>
     <message>
         <source>Show all kits in &quot;Build &amp; Run&quot; in &quot;Projects&quot; mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle Kits in &quot;Erstellung und Ausführung&quot; im Modus &quot;Projekte&quot; anzeigen</translation>
     </message>
     <message>
         <source>Show also inactive kits in &quot;Build &amp; Run&quot; in &quot;Projects&quot; mode.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeige auch inaktive Kits in &quot;Erstellung und Ausführung&quot; im Modus &quot;Projekte&quot;.</translation>
     </message>
     <message>
         <source>Environment changes to apply to run configurations, but not build configurations.</source>
@@ -44292,7 +44301,7 @@ Was soll %1 tun?</translation>
     </message>
     <message>
         <source>Time to wait before force-stopping applications:</source>
-        <translation type="unfinished"></translation>
+        <translation>Zu wartende Zeit vor dem erzwungenen Beenden von Anwendungen:</translation>
     </message>
     <message>
         <source>Files</source>
@@ -44392,7 +44401,7 @@ Was soll %1 tun?</translation>
     </message>
     <message>
         <source>Template used to construct the default build directory.&lt;br&gt;&lt;br&gt;The default value can be set using the environment variable &lt;tt&gt;%1&lt;/tt&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vorlage für das Standard-Build-Verzeichnis.&lt;br&gt;&lt;br&gt;Der Standardwert kann über die Umgebungsvariable &lt;tt&gt;%1&lt;/tt&gt; gesetzt werden.</translation>
     </message>
     <message>
         <source>QML debugging:</source>
@@ -44615,15 +44624,15 @@ fails because Clang does not understand the target architecture.</source>
     </message>
     <message>
         <source>You can edit this configuration inside the .qtcreator/project.json file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie können diese Konfiguration über die Datei &quot;.qtcreator/project.json&quot; bearbeiten.</translation>
     </message>
     <message>
         <source>Exclude from Project</source>
-        <translation type="unfinished"></translation>
+        <translation>Vom Projekt ausschließen</translation>
     </message>
     <message>
         <source>Rescan Workspace</source>
-        <translation type="unfinished"></translation>
+        <translation>Workspace erneut durchsuchen</translation>
     </message>
 </context>
 <context>
@@ -44786,28 +44795,28 @@ fails because Clang does not understand the target architecture.</source>
     </message>
     <message>
         <source>Update Requirements</source>
-        <translation type="unfinished"></translation>
+        <translation>Requirements aktualisieren</translation>
     </message>
     <message>
         <source>Install Requirements</source>
-        <translation type="unfinished"></translation>
+        <translation>Requirements installieren</translation>
     </message>
     <message>
         <source>Update %1</source>
         <extracomment>%1 = package name</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>%1 aktualisieren</translation>
     </message>
     <message>
         <source>Install %1</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 installieren</translation>
     </message>
     <message>
         <source>Update Packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Pakete aktualisieren</translation>
     </message>
     <message>
         <source>Install Packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Pakete installieren</translation>
     </message>
     <message>
         <source>Running &quot;%1&quot; to install %2.</source>
@@ -44912,19 +44921,19 @@ fails because Clang does not understand the target architecture.</source>
     </message>
     <message>
         <source>Update Python language server (PyLS) for %1 (%2).</source>
-        <translation type="unfinished"></translation>
+        <translation>Python Language Server (PyLS) für %1 (%2) aktualisieren.</translation>
     </message>
     <message>
         <source>Always Update</source>
-        <translation type="unfinished"></translation>
+        <translation>Immer aktualisieren</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktualisieren</translation>
     </message>
     <message>
         <source>Never</source>
-        <translation type="unfinished">Niemals</translation>
+        <translation>Niemals</translation>
     </message>
     <message>
         <source>Searching Python binaries...</source>
@@ -45952,7 +45961,7 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
     </message>
     <message>
         <source>Unable to start &quot;%1&quot;.</source>
-        <translation type="unfinished"></translation>
+        <translation>&quot;%1&quot; kann nicht gestartet werden.</translation>
     </message>
     <message>
         <source>Qt Widgets Designer is not responding (%1).</source>
@@ -59540,31 +59549,31 @@ should a repository require SSH-authentication (see documentation on SSH and the
     </message>
     <message>
         <source>Reset</source>
-        <translation type="unfinished">Zurücksetzen</translation>
+        <translation>Zurücksetzen</translation>
     </message>
     <message>
         <source>Relations</source>
-        <translation type="unfinished"></translation>
+        <translation>Beziehungen</translation>
     </message>
     <message>
         <source>Diagram Elements</source>
-        <translation type="unfinished"></translation>
+        <translation>Diagrammelemente</translation>
     </message>
     <message>
         <source>Clear</source>
-        <translation type="unfinished">Löschen</translation>
+        <translation>Löschen</translation>
     </message>
     <message>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>Ansicht</translation>
     </message>
     <message>
         <source>Filter</source>
-        <translation type="unfinished">Filter</translation>
+        <translation>Filter</translation>
     </message>
     <message>
         <source>Type:</source>
-        <translation type="unfinished">Typ:</translation>
+        <translation>Typ:</translation>
     </message>
     <message>
         <source>Stereotypes:</source>
@@ -59836,11 +59845,11 @@ should a repository require SSH-authentication (see documentation on SSH and the
     </message>
     <message>
         <source>Warning</source>
-        <translation type="unfinished">Warnung</translation>
+        <translation>Warnung</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished">Fehler</translation>
+        <translation>Fehler</translation>
     </message>
     <message>
         <source>Intermediate points:</source>
@@ -59972,7 +59981,7 @@ should a repository require SSH-authentication (see documentation on SSH and the
     </message>
     <message>
         <source>Open Linked File</source>
-        <translation type="unfinished"></translation>
+        <translation>Verlinkte Datei öffnen</translation>
     </message>
     <message>
         <source>Align Bottom</source>
@@ -60040,27 +60049,27 @@ should a repository require SSH-authentication (see documentation on SSH and the
     </message>
     <message>
         <source>Relation Attributes</source>
-        <translation type="unfinished"></translation>
+        <translation>Beziehungsattribute</translation>
     </message>
     <message>
         <source>Type</source>
-        <translation type="unfinished">Typ</translation>
+        <translation>Typ</translation>
     </message>
     <message>
         <source>Direction</source>
-        <translation type="unfinished"></translation>
+        <translation>Richtung</translation>
     </message>
     <message>
         <source>Stereotypes</source>
-        <translation type="unfinished"></translation>
+        <translation>Stereotype</translation>
     </message>
     <message>
         <source>Other Element Attributes</source>
-        <translation type="unfinished"></translation>
+        <translation>Andere Elementattribute</translation>
     </message>
     <message>
         <source>Number of matching elements: </source>
-        <translation type="unfinished"></translation>
+        <translation>Anzahl der übereinstimmenden Elemente: </translation>
     </message>
 </context>
 <context>
diff --git a/src/libs/3rdparty/libvterm/vterm.qbs b/src/libs/3rdparty/libvterm/vterm.qbs
index e35658908da..4c3a08e519e 100644
--- a/src/libs/3rdparty/libvterm/vterm.qbs
+++ b/src/libs/3rdparty/libvterm/vterm.qbs
@@ -30,6 +30,6 @@ QtcLibrary {
 
     Export {
         Depends { name: "cpp" }
-        cpp.includePaths: "include"
+        cpp.includePaths: exportingProduct.sourceDirectory + "/include"
     }
 }
diff --git a/src/libs/modelinglib/modelinglib.qbs b/src/libs/modelinglib/modelinglib.qbs
index 9929bf33c03..54ad0cad64c 100644
--- a/src/libs/modelinglib/modelinglib.qbs
+++ b/src/libs/modelinglib/modelinglib.qbs
@@ -396,8 +396,8 @@ QtcLibrary {
 
     Export {
         cpp.includePaths: [
-            ".",
-            "./qtserialization/inc"
+            exportingProduct.sourceDirectory,
+            exportingProduct.sourceDirectory + "/qtserialization/inc"
         ]
     }
 }
diff --git a/src/libs/solutions/spinner/spinner.qbs b/src/libs/solutions/spinner/spinner.qbs
index d02858d0484..74fefc89875 100644
--- a/src/libs/solutions/spinner/spinner.qbs
+++ b/src/libs/solutions/spinner/spinner.qbs
@@ -14,7 +14,7 @@ QtcLibrary {
 
     Export {
         Depends { name: "cpp" }
-        cpp.includePaths: ".."
+        cpp.includePaths: exportingProduct.sourceDirectory + "/.."
     }
 }
 
diff --git a/src/libs/solutions/tasking/tasking.qbs b/src/libs/solutions/tasking/tasking.qbs
index 90f3306e8e2..1930fada35f 100644
--- a/src/libs/solutions/tasking/tasking.qbs
+++ b/src/libs/solutions/tasking/tasking.qbs
@@ -26,7 +26,10 @@ QtcLibrary {
 
     Export {
         Depends { name: "cpp" }
-        cpp.includePaths: ["..", "../.."]
+        cpp.includePaths: [
+            exportingProduct.sourceDirectory + "/..",
+            exportingProduct.sourceDirectory + "/../.."
+        ]
     }
 }
 
diff --git a/src/libs/utils/osspecificaspects.h b/src/libs/utils/osspecificaspects.h
index 43bc28447de..a79f9833bfb 100644
--- a/src/libs/utils/osspecificaspects.h
+++ b/src/libs/utils/osspecificaspects.h
@@ -53,7 +53,7 @@ inline Utils::expected_str<OsType> osTypeFromString(const QString &string)
 
 inline Utils::expected_str<OsArch> osArchFromString(const QString &architecture)
 {
-    if (architecture == QLatin1String("x86_64"))
+    if (architecture == QLatin1String("x86_64") || architecture == QLatin1String("amd64"))
         return OsArchAMD64;
     if (architecture == QLatin1String("x86"))
         return OsArchX86;
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index 8dd497d16d5..820fa6fb459 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -474,6 +474,6 @@ QtcLibrary {
     Export {
         Depends { name: "Qt"; submodules: ["concurrent", "widgets" ] }
         Depends { name: "Tasking" }
-        cpp.includePaths: "mimetypes2"
+        cpp.includePaths: exportingProduct.sourceDirectory + "/mimetypes2"
     }
 }
diff --git a/src/plugins/cmakeprojectmanager/builddirparameters.cpp b/src/plugins/cmakeprojectmanager/builddirparameters.cpp
index f87157e23ff..90f5f522299 100644
--- a/src/plugins/cmakeprojectmanager/builddirparameters.cpp
+++ b/src/plugins/cmakeprojectmanager/builddirparameters.cpp
@@ -37,7 +37,7 @@ static void updateCMakePathsFromQMake(QStringList &initialCMakeArguments)
         return;
 
     // ~Qt/6.x/platform/bin/qmake -> ~Qt/6.x/platform
-    const QByteArray qmakePrefixPath = qmakeFilePath.parentDir().parentDir().toString().toUtf8();
+    const QByteArray qmakePrefixPath = qmakeFilePath.parentDir().parentDir().path().toUtf8();
     const QByteArrayList cmakePathsVariables = {"CMAKE_PREFIX_PATH", "CMAKE_FIND_ROOT_PATH"};
 
     for (const QByteArray &var : cmakePathsVariables) {
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
index 540192d2d21..8a65c45b7f9 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
@@ -399,12 +399,10 @@ static SnippetAndLocation generateSnippetAndLocationForSources(
 static expected_str<bool> insertSnippetSilently(const FilePath &cmakeFile,
                                                 const SnippetAndLocation &snippetLocation)
 {
-    BaseTextEditor *editor = qobject_cast<BaseTextEditor *>(
-        Core::EditorManager::openEditorAt({cmakeFile,
-                                           int(snippetLocation.line),
-                                           int(snippetLocation.column)},
-                                          Constants::CMAKE_EDITOR_ID,
-                                          Core::EditorManager::DoNotMakeVisible));
+    BaseTextEditor *editor = qobject_cast<BaseTextEditor *>(Core::EditorManager::openEditorAt(
+        {cmakeFile, int(snippetLocation.line), int(snippetLocation.column)},
+        Constants::CMAKE_EDITOR_ID,
+        Core::EditorManager::DoNotMakeVisible | Core::EditorManager::DoNotChangeCurrentEditor));
     if (!editor) {
         return make_unexpected("BaseTextEditor cannot be obtained for " + cmakeFile.toUserOutput()
                                + ":" + QString::number(snippetLocation.line) + ":"
@@ -864,12 +862,13 @@ RemovedFilesFromProject CMakeBuildSystem::removeFiles(Node *context,
                 }
 
                 BaseTextEditor *editor = qobject_cast<BaseTextEditor *>(
-                    Core::EditorManager::openEditorAt({filePos.value().cmakeFile,
-                                                       static_cast<int>(filePos.value().argumentPosition.Line),
-                                                       static_cast<int>(filePos.value().argumentPosition.Column
-                                                                        - 1)},
-                                                      Constants::CMAKE_EDITOR_ID,
-                                                      Core::EditorManager::DoNotMakeVisible));
+                    Core::EditorManager::openEditorAt(
+                        {filePos.value().cmakeFile,
+                         static_cast<int>(filePos.value().argumentPosition.Line),
+                         static_cast<int>(filePos.value().argumentPosition.Column - 1)},
+                        Constants::CMAKE_EDITOR_ID,
+                        Core::EditorManager::DoNotMakeVisible
+                            | Core::EditorManager::DoNotChangeCurrentEditor));
                 if (!editor) {
                     badFiles << file;
 
@@ -976,7 +975,8 @@ bool CMakeBuildSystem::renameFile(Node *context,
                          static_cast<int>(fileToRename->argumentPosition.Line),
                          static_cast<int>(fileToRename->argumentPosition.Column - 1)},
                         Constants::CMAKE_EDITOR_ID,
-                        Core::EditorManager::DoNotMakeVisible));
+                        Core::EditorManager::DoNotMakeVisible
+                            | Core::EditorManager::DoNotChangeCurrentEditor));
                 if (!editor) {
                     qCCritical(cmakeBuildSystemLog).noquote()
                         << "BaseTextEditor cannot be obtained for" << fileToRename->cmakeFile.path()
diff --git a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp
index 7a6de1749de..c76af32e775 100644
--- a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp
+++ b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp
@@ -16,6 +16,7 @@
 
 #include <utils/algorithm.h>
 #include <utils/icon.h>
+#include <utils/fsengine/fileiconprovider.h>
 #include <utils/mimeconstants.h>
 #include <utils/mimeutils.h>
 #include <utils/qtcprocess.h>
@@ -627,7 +628,7 @@ static FolderNode *createSourceGroupNode(const QString &sourceGroupName,
             if (!existingNode) {
                 auto node = createCMakeVFolder(sourceDirectory, Node::DefaultFolderPriority + 5, p);
                 node->setListInProject(false);
-                node->setIcon([] { return Icon::fromTheme("edit-copy"); });
+                node->setIcon([] { return FileIconProvider::icon(QFileIconProvider::Folder); });
 
                 existingNode = node.get();
 
diff --git a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
index 172b54570e1..cf98617261d 100644
--- a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
+++ b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
@@ -20,11 +20,14 @@
 
 #include <QFocusEvent>
 #include <QHeaderView>
-#include <QVBoxLayout>
+#include <QLoggingCategory>
 #include <QScrollBar>
+#include <QVBoxLayout>
 
 using namespace Utils;
 
+Q_LOGGING_CATEGORY(openEditorsLog, "qtc.core.openeditorswindow", QtWarningMsg);
+
 namespace Core::Internal {
 
 class OpenEditorsItem : public TreeItem
@@ -196,9 +199,10 @@ bool OpenEditorsWindow::eventFilter(QObject *obj, QEvent *e)
 
         } else if (e->type() == QEvent::KeyRelease) {
             auto ke = static_cast<QKeyEvent*>(e);
+            qCDebug(openEditorsLog()) << ke;
             if (ke->modifiers() == 0
-                    /*HACK this is to overcome some event inconsistencies between platforms*/
-                    || (ke->modifiers() == Qt::AltModifier
+                /*HACK this is to overcome some event inconsistencies between platforms*/
+                || (ke->modifiers() == Qt::AltModifier
                     && (ke->key() == Qt::Key_Alt || ke->key() == -1))) {
                 selectAndHide();
             }
diff --git a/src/plugins/coreplugin/editortoolbar.cpp b/src/plugins/coreplugin/editortoolbar.cpp
index a410f0335c9..75ca726ec9e 100644
--- a/src/plugins/coreplugin/editortoolbar.cpp
+++ b/src/plugins/coreplugin/editortoolbar.cpp
@@ -193,9 +193,13 @@ EditorToolBar::EditorToolBar(QWidget *parent) :
        menu.exec(d->m_editorList->mapToGlobal(p));
     });
     connect(d->m_dragHandleMenu, &QMenu::aboutToShow, this, [this] {
-       d->m_dragHandleMenu->clear();
        fillListContextMenu(d->m_dragHandleMenu);
     });
+    connect(d->m_dragHandleMenu, &QMenu::aboutToHide, this, [this] {
+        // Remove actions from context menu, to avoid any shortcuts set on them
+        // for the display in the menu interfering with global actions
+        d->m_dragHandleMenu->clear();
+    });
     connect(d->m_lockButton, &QAbstractButton::clicked, this, &EditorToolBar::makeEditorWritable);
     connect(d->m_closeEditorButton, &QAbstractButton::clicked,
             this, &EditorToolBar::closeEditor, Qt::QueuedConnection);
diff --git a/src/plugins/coreplugin/find/findtoolbar.cpp b/src/plugins/coreplugin/find/findtoolbar.cpp
index 681fa407063..0111093c27d 100644
--- a/src/plugins/coreplugin/find/findtoolbar.cpp
+++ b/src/plugins/coreplugin/find/findtoolbar.cpp
@@ -160,15 +160,6 @@ FindToolBar::FindToolBar(CurrentDocumentFind *currentDocumentFind)
     setProperty(StyleHelper::C_TOP_BORDER, true);
     setSingleRow(false);
 
-    QWidget::setTabOrder(m_findEdit, m_replaceEdit);
-    QWidget::setTabOrder(m_replaceEdit, m_findPreviousButton);
-    QWidget::setTabOrder(m_findPreviousButton, m_findNextButton);
-    QWidget::setTabOrder(m_findNextButton, m_replaceButton);
-    QWidget::setTabOrder(m_replaceButton, m_replaceNextButton);
-    QWidget::setTabOrder(m_replaceNextButton, m_replaceAllButton);
-    QWidget::setTabOrder(m_replaceAllButton, m_advancedButton);
-    QWidget::setTabOrder(m_advancedButton, m_close);
-
     connect(m_findEdit, &Utils::FancyLineEdit::editingFinished,
             this, &FindToolBar::invokeResetIncrementalSearch);
     connect(m_findEdit, &Utils::FancyLineEdit::textChanged,
@@ -447,6 +438,17 @@ FindToolBar::FindToolBar(CurrentDocumentFind *currentDocumentFind)
     connect(&m_findStepTimer, &QTimer::timeout, this, &FindToolBar::invokeFindStep);
 
     setLightColoredIcon(isLightColored());
+
+    QWidget::setTabOrder(m_findEdit->button(FancyLineEdit::Left), m_findEdit);
+    QWidget::setTabOrder(m_findEdit, m_replaceEdit);
+    QWidget::setTabOrder(m_replaceEdit, m_findPreviousButton);
+    QWidget::setTabOrder(m_findPreviousButton, m_findNextButton);
+    QWidget::setTabOrder(m_findNextButton, m_selectAllButton);
+    QWidget::setTabOrder(m_selectAllButton, m_replaceButton);
+    QWidget::setTabOrder(m_replaceButton, m_replaceNextButton);
+    QWidget::setTabOrder(m_replaceNextButton, m_replaceAllButton);
+    QWidget::setTabOrder(m_replaceAllButton, m_advancedButton);
+    QWidget::setTabOrder(m_advancedButton, m_close);
 }
 
 FindToolBar::~FindToolBar() = default;
@@ -1024,23 +1026,6 @@ void FindToolBar::selectAll()
     }
 }
 
-bool FindToolBar::focusNextPrevChild(bool next)
-{
-    QAbstractButton *optionsButton = m_findEdit->button(Utils::FancyLineEdit::Left);
-    // close tab order
-    if (next && m_advancedButton->hasFocus())
-        optionsButton->setFocus(Qt::TabFocusReason);
-    else if (next && optionsButton->hasFocus())
-        m_findEdit->setFocus(Qt::TabFocusReason);
-    else if (!next && optionsButton->hasFocus())
-        m_advancedButton->setFocus(Qt::TabFocusReason);
-    else if (!next && m_findEdit->hasFocus())
-        optionsButton->setFocus(Qt::TabFocusReason);
-    else
-        return Utils::StyledBar::focusNextPrevChild(next);
-    return true;
-}
-
 void FindToolBar::resizeEvent(QResizeEvent *event)
 {
     Q_UNUSED(event)
diff --git a/src/plugins/coreplugin/find/findtoolbar.h b/src/plugins/coreplugin/find/findtoolbar.h
index 1080407dae9..e5ddbf8c75c 100644
--- a/src/plugins/coreplugin/find/findtoolbar.h
+++ b/src/plugins/coreplugin/find/findtoolbar.h
@@ -64,7 +64,6 @@ public slots:
     void setBackward(bool backward);
 
 protected:
-    bool focusNextPrevChild(bool next) override;
     void resizeEvent(QResizeEvent *event) override;
 
 private:
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/plugins/cppeditor/cppdoxygen_test.cpp b/src/plugins/cppeditor/cppdoxygen_test.cpp
index 2d85345303a..8ef6a6fff0f 100644
--- a/src/plugins/cppeditor/cppdoxygen_test.cpp
+++ b/src/plugins/cppeditor/cppdoxygen_test.cpp
@@ -488,7 +488,7 @@ void DoxygenTest::runTest(const QByteArray &original,
     //    testDocument.m_editorWidget->unfoldAll();
     testDocument.m_editor->setCursorPosition(testDocument.m_cursorPosition);
 
-    TestCase::waitForRehighlightedSemanticDocument(testDocument.m_editorWidget);
+    QVERIFY(TestCase::waitForRehighlightedSemanticDocument(testDocument.m_editorWidget));
 
     // Send 'ENTER' key press
     QKeyEvent event(QEvent::KeyPress, Qt::Key_Enter, Qt::NoModifier);
diff --git a/src/plugins/cppeditor/cpptoolstestcase.cpp b/src/plugins/cppeditor/cpptoolstestcase.cpp
index 70435abe9f9..3ac2feeca38 100644
--- a/src/plugins/cppeditor/cpptoolstestcase.cpp
+++ b/src/plugins/cppeditor/cpptoolstestcase.cpp
@@ -295,10 +295,18 @@ bool TestCase::waitForProcessedEditorDocument(const FilePath &filePath, int time
     return waitForProcessedEditorDocument_internal(editorDocument, timeOutInMs);
 }
 
-CPlusPlus::Document::Ptr TestCase::waitForRehighlightedSemanticDocument(CppEditorWidget *editorWidget)
+CPlusPlus::Document::Ptr TestCase::waitForRehighlightedSemanticDocument(
+    CppEditorWidget *editorWidget, int timeoutInMs)
 {
-    while (!editorWidget->isSemanticInfoValid())
+    QElapsedTimer timer;
+    timer.start();
+
+    while (!editorWidget->isSemanticInfoValid()) {
+        if (timer.elapsed() >= timeoutInMs)
+            return {};
         QCoreApplication::processEvents();
+        QThread::msleep(20);
+    }
     return editorWidget->semanticInfo().doc;
 }
 
diff --git a/src/plugins/cppeditor/cpptoolstestcase.h b/src/plugins/cppeditor/cpptoolstestcase.h
index 6e9f0133ba2..6439075efbd 100644
--- a/src/plugins/cppeditor/cpptoolstestcase.h
+++ b/src/plugins/cppeditor/cpptoolstestcase.h
@@ -140,7 +140,7 @@ public:
             const Utils::FilePath &filePath, int timeOutInMs = 5000);
 
     static CPlusPlus::Document::Ptr waitForRehighlightedSemanticDocument(
-            CppEditorWidget *editorWidget);
+        CppEditorWidget *editorWidget, int timeoutInMs = defaultTimeOutInMs);
 
     enum { defaultTimeOutInMs = 30 * 1000 /*= 30 secs*/ };
     static bool waitUntilProjectIsFullyOpened(ProjectExplorer::Project *project,
diff --git a/src/plugins/cppeditor/cppuseselections_test.cpp b/src/plugins/cppeditor/cppuseselections_test.cpp
index 460e502c8fe..85ed9be442e 100644
--- a/src/plugins/cppeditor/cppuseselections_test.cpp
+++ b/src/plugins/cppeditor/cppuseselections_test.cpp
@@ -77,7 +77,7 @@ UseSelectionsTestCase::UseSelectionsTestCase(CppTestDocument &testFile,
     closeEditorAtEndOfTestCase(testFile.m_editor);
 
     testFile.m_editor->setCursorPosition(testFile.m_cursorPosition);
-    waitForRehighlightedSemanticDocument(m_editorWidget);
+    QVERIFY(waitForRehighlightedSemanticDocument(m_editorWidget));
 
     bool hasTimedOut;
     const SelectionList selections = waitForUseSelections(&hasTimedOut);
diff --git a/src/plugins/cppeditor/fileandtokenactions_test.cpp b/src/plugins/cppeditor/fileandtokenactions_test.cpp
index 7c8175fa188..9e9a7a2f29f 100644
--- a/src/plugins/cppeditor/fileandtokenactions_test.cpp
+++ b/src/plugins/cppeditor/fileandtokenactions_test.cpp
@@ -164,7 +164,7 @@ TestActionsTestCase::TestActionsTestCase(const Actions &tokenActions, const Acti
         QVERIFY(CppModelManager::workingCopy().get(filePath));
 
         // Rehighlight
-        waitForRehighlightedSemanticDocument(editorWidget);
+        QVERIFY(waitForRehighlightedSemanticDocument(editorWidget));
 
         // Run all file actions
         executeActionsOnEditorWidget(editorWidget, fileActions);
diff --git a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
index 41dd6b538f6..3d19a84b758 100644
--- a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
+++ b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
@@ -310,7 +310,7 @@ F2TestCase::F2TestCase(CppEditorAction action,
 
         // Rehighlight
         if (!useClangd)
-            waitForRehighlightedSemanticDocument(testFile->m_editorWidget);
+            QVERIFY(waitForRehighlightedSemanticDocument(testFile->m_editorWidget));
     }
 
     // Activate editor of initial test file
diff --git a/src/plugins/cppeditor/quickfixes/cppquickfix_test.cpp b/src/plugins/cppeditor/quickfixes/cppquickfix_test.cpp
index 2bde0a10212..f487764101b 100644
--- a/src/plugins/cppeditor/quickfixes/cppquickfix_test.cpp
+++ b/src/plugins/cppeditor/quickfixes/cppquickfix_test.cpp
@@ -104,7 +104,7 @@ BaseQuickFixTestCase::BaseQuickFixTestCase(const QList<TestDocumentPtr> &testDoc
         }
 
         // Rehighlight
-        waitForRehighlightedSemanticDocument(document->m_editorWidget);
+        QVERIFY(waitForRehighlightedSemanticDocument(document->m_editorWidget));
     }
 
     // Enforce the default cpp code style, so we are independent of config file settings.
diff --git a/src/plugins/languageclient/client.cpp b/src/plugins/languageclient/client.cpp
index 412430171dc..4c2fcf101f6 100644
--- a/src/plugins/languageclient/client.cpp
+++ b/src/plugins/languageclient/client.cpp
@@ -299,6 +299,12 @@ public:
 
     bool reset();
 
+    void setState(Client::State state)
+    {
+        m_state = state;
+        emit q->stateChanged(state);
+    }
+
     Client::State m_state = Client::Uninitialized;
     QHash<LanguageServerProtocol::MessageId,
           LanguageServerProtocol::ResponseHandler::Callback> m_responseHandlers;
@@ -569,7 +575,7 @@ void Client::initialize()
 
     // directly send content now otherwise the state check of sendContent would fail
     d->sendMessageNow(initRequest);
-    d->m_state = InitializeRequested;
+    d->setState(InitializeRequested);
 }
 
 void Client::shutdown()
@@ -581,7 +587,7 @@ void Client::shutdown()
         d->shutDownCallback(shutdownResponse);
     });
     sendMessage(shutdown);
-    d->m_state = ShutdownRequested;
+    d->setState(ShutdownRequested);
     d->m_shutdownTimer.start();
 }
 
@@ -1526,7 +1532,7 @@ void Client::projectClosed(ProjectExplorer::Project *project)
         if (d->m_state == Initialized) {
             LanguageClientManager::shutdownClient(this);
         } else {
-            d->m_state = Shutdown; // otherwise the manager would try to restart this server
+            d->setState(Shutdown); // otherwise the manager would try to restart this server
             emit finished();
         }
         d->m_project = nullptr;
@@ -1696,7 +1702,7 @@ bool ClientPrivate::reset()
     }
     m_restartCountResetTimer.start();
     --m_restartsLeft;
-    m_state = Client::Uninitialized;
+    setState(Client::Uninitialized);
     m_responseHandlers.clear();
     m_clientInterface->resetBuffer();
     updateOpenedEditorToolBars();
@@ -1723,7 +1729,7 @@ bool ClientPrivate::reset()
 void Client::setError(const QString &message)
 {
     log(message);
-    d->m_state = d->m_state < Initialized ? FailedToInitialize : Error;
+    d->setState(d->m_state < Initialized ? FailedToInitialize : Error);
 }
 
 ProgressManager *Client::progressManager()
@@ -2152,7 +2158,7 @@ void ClientPrivate::initializeCallback(const InitializeRequest::Response &initRe
                                                    QMessageBox::Retry | QMessageBox::Cancel,
                                                    QMessageBox::Retry);
                 if (result == QMessageBox::Retry) {
-                    m_state = Client::Uninitialized;
+                    setState(Client::Uninitialized);
                     q->initialize();
                     return;
                 }
@@ -2204,7 +2210,7 @@ void ClientPrivate::initializeCallback(const InitializeRequest::Response &initRe
         m_tokenSupport.setLegend(tokenProvider.legend());
 
     qCDebug(LOGLSPCLIENT) << "language server " << m_displayName << " initialized";
-    m_state = Client::Initialized;
+    setState(Client::Initialized);
     q->sendMessage(InitializeNotification(InitializedParams()));
 
     q->updateConfiguration(m_configuration);
@@ -2227,7 +2233,7 @@ void ClientPrivate::shutDownCallback(const ShutdownRequest::Response &shutdownRe
     // directly send content now otherwise the state check of sendContent would fail
     sendMessageNow(ExitNotification());
     qCDebug(LOGLSPCLIENT) << "language server " << m_displayName << " shutdown";
-    m_state = Client::Shutdown;
+    setState(Client::Shutdown);
     m_shutdownTimer.start();
 }
 
diff --git a/src/plugins/languageclient/client.h b/src/plugins/languageclient/client.h
index 28360c71a6f..13e908b2d50 100644
--- a/src/plugins/languageclient/client.h
+++ b/src/plugins/languageclient/client.h
@@ -215,6 +215,7 @@ signals:
     void documentUpdated(TextEditor::TextDocument *document);
     void workDone(const LanguageServerProtocol::ProgressToken &token);
     void shadowDocumentSwitched(const Utils::FilePath &filePath);
+    void stateChanged(State state);
     void finished();
 
 protected:
diff --git a/src/plugins/languageclient/languageclientmanager.cpp b/src/plugins/languageclient/languageclientmanager.cpp
index 11ce6b4618e..3022ba527d9 100644
--- a/src/plugins/languageclient/languageclientmanager.cpp
+++ b/src/plugins/languageclient/languageclientmanager.cpp
@@ -275,13 +275,14 @@ LanguageClientManager *LanguageClientManager::instance()
     return managerInstance;
 }
 
-QList<Client *> LanguageClientManager::clientsSupportingDocument(const TextEditor::TextDocument *doc)
+QList<Client *> LanguageClientManager::clientsSupportingDocument(
+    const TextEditor::TextDocument *doc, bool onlyReachable)
 {
     QTC_ASSERT(managerInstance, return {});
     QTC_ASSERT(doc, return {};);
-    return Utils::filtered(managerInstance->reachableClients(), [doc](Client *client) {
-        return client->isSupportedDocument(doc);
-    });
+    return Utils::filtered(
+        onlyReachable ? managerInstance->reachableClients() : managerInstance->m_clients,
+        [doc](Client *client) { return client->isSupportedDocument(doc); });
 }
 
 void LanguageClientManager::applySettings()
diff --git a/src/plugins/languageclient/languageclientmanager.h b/src/plugins/languageclient/languageclientmanager.h
index 12bef4f6fe4..a970ef66d27 100644
--- a/src/plugins/languageclient/languageclientmanager.h
+++ b/src/plugins/languageclient/languageclientmanager.h
@@ -48,7 +48,8 @@ public:
 
     static LanguageClientManager *instance();
 
-    static QList<Client *> clientsSupportingDocument(const TextEditor::TextDocument *doc);
+    static QList<Client *> clientsSupportingDocument(
+        const TextEditor::TextDocument *doc, bool onlyReachable = true);
 
     static void applySettings();
     static QList<BaseSettings *> currentSettings();
diff --git a/src/plugins/languageclient/languageclientutils.cpp b/src/plugins/languageclient/languageclientutils.cpp
index ce02785e9c8..8c40615f163 100644
--- a/src/plugins/languageclient/languageclientutils.cpp
+++ b/src/plugins/languageclient/languageclientutils.cpp
@@ -253,7 +253,7 @@ void updateEditorToolBar(Core::IEditor *editor)
             auto menu = new QMenu;
             auto clientsGroup = new QActionGroup(menu);
             clientsGroup->setExclusive(true);
-            for (auto client : LanguageClientManager::clientsSupportingDocument(document)) {
+            for (auto client : LanguageClientManager::clientsSupportingDocument(document, false)) {
                 auto action = clientsGroup->addAction(client->name());
                 auto reopen = [action, client = QPointer(client), document] {
                     if (!client)
@@ -263,6 +263,10 @@ void updateEditorToolBar(Core::IEditor *editor)
                 };
                 action->setCheckable(true);
                 action->setChecked(client == LanguageClientManager::clientForDocument(document));
+                action->setEnabled(client->reachable());
+                QObject::connect(client, &Client::stateChanged, action, [action, client] {
+                    action->setEnabled(client->reachable());
+                });
                 QObject::connect(action, &QAction::triggered, reopen);
             }
             menu->addActions(clientsGroup->actions());
diff --git a/src/plugins/perfprofiler/perfprofiler.qbs b/src/plugins/perfprofiler/perfprofiler.qbs
index fe97d521f93..2c9ddab3616 100644
--- a/src/plugins/perfprofiler/perfprofiler.qbs
+++ b/src/plugins/perfprofiler/perfprofiler.qbs
@@ -62,6 +62,7 @@ QtcPlugin {
         "perfprofiler.qrc",
     ]
 
+    Qt.core.resourceFileBaseName: "PerfProfilerQml" // avoid conflicting qrc file
     Group {
         name: "Qml Files"
         Qt.core.resourcePrefix: "qt/qml/QtCreator/PerfProfiler/"
diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp
index 8d8455f5aee..24a710f9f5f 100644
--- a/src/plugins/projectexplorer/appoutputpane.cpp
+++ b/src/plugins/projectexplorer/appoutputpane.cpp
@@ -400,6 +400,11 @@ void AppOutputPane::createNewOutputWindow(RunControl *rc)
                    && thisWorkingDirectory == tab.runControl->workingDirectory()
                    && thisEnvironment == tab.runControl->environment();
         });
+    const auto updateOutputFileName = [this](int index, RunControl *rc) {
+        qobject_cast<OutputWindow *>(m_tabWidget->widget(index))
+            //: file name suggested for saving application output, %1 = run configuration display name
+            ->setOutputFileNameHint(Tr::tr("application-output-%1.txt").arg(rc->displayName()));
+    };
     if (tab != m_runControlTabs.end()) {
         // Reuse this tab
         if (tab->runControl)
@@ -415,6 +420,7 @@ void AppOutputPane::createNewOutputWindow(RunControl *rc)
         const int tabIndex = m_tabWidget->indexOf(tab->window);
         QTC_ASSERT(tabIndex != -1, return);
         m_tabWidget->setTabText(tabIndex, rc->displayName());
+        updateOutputFileName(tabIndex, rc);
 
         tab->window->scrollToBottom();
         qCDebug(appOutputLog) << "AppOutputPane::createNewOutputWindow: Reusing tab"
@@ -430,8 +436,6 @@ void AppOutputPane::createNewOutputWindow(RunControl *rc)
     ow->setWindowIcon(Icons::WINDOW.icon());
     ow->setWordWrapEnabled(m_settings.wrapOutput);
     ow->setMaxCharCount(m_settings.maxCharCount);
-    //: file name suggested for saving application output, %1 = run configuration display name
-    ow->setOutputFileNameHint(Tr::tr("application-output-%1.txt").arg(rc->displayName()));
 
     auto updateFontSettings = [ow] {
         ow->setBaseFont(TextEditor::TextEditorSettings::fontSettings().font());
@@ -457,6 +461,7 @@ void AppOutputPane::createNewOutputWindow(RunControl *rc)
 
     m_runControlTabs.push_back(RunControlTab(rc, ow));
     m_tabWidget->addTab(ow, rc->displayName());
+    updateOutputFileName(m_tabWidget->count() - 1, rc);
     qCDebug(appOutputLog) << "AppOutputPane::createNewOutputWindow: Adding tab for" << rc;
     updateCloseActions();
     setFilteringEnabled(m_tabWidget->count() > 0);
diff --git a/src/plugins/projectexplorer/environmentwidget.cpp b/src/plugins/projectexplorer/environmentwidget.cpp
index c62a9488594..6ef817d2797 100644
--- a/src/plugins/projectexplorer/environmentwidget.cpp
+++ b/src/plugins/projectexplorer/environmentwidget.cpp
@@ -237,6 +237,7 @@ EnvironmentWidget::EnvironmentWidget(QWidget *parent, Type type, QWidget *additi
     buttonLayout->addWidget(d->m_toggleButton);
     connect(d->m_toggleButton, &QPushButton::clicked, this, [this] {
         d->m_model->toggleVariable(d->m_environmentView->currentIndex());
+        d->m_editor.setEnvironmentItems(d->m_model->userChanges());
         updateButtons();
     });
 
diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp
index 036376c67af..e9831e9bd73 100644
--- a/src/plugins/remotelinux/linuxdevice.cpp
+++ b/src/plugins/remotelinux/linuxdevice.cpp
@@ -1337,7 +1337,7 @@ static FilePaths dirsToCreate(const FilesToTransfer &files)
 
 static QByteArray transferCommand(bool link)
 {
-    return link ? "ln -s" : "put";
+    return link ? "ln -s" : "put -R";
 }
 
 class SshTransferInterface : public FileTransferInterface
@@ -1558,7 +1558,7 @@ private:
             const auto batchIt = m_batches.begin();
             for (auto filesIt = batchIt->cbegin(); filesIt != batchIt->cend(); ++filesIt) {
                 const FileToTransfer fixedFile = fixLocalFileOnWindows(*filesIt, options);
-                options << fixedLocalPath(fixedFile.m_source);
+                options << fixedFile.m_source.path();
             }
             options << fixedRemotePath(batchIt.key(), userAtHost());
             m_batches.erase(batchIt);
@@ -1588,11 +1588,6 @@ private:
         return fixedFile;
     }
 
-    QString fixedLocalPath(const FilePath &file) const
-    {
-        return file.isDir() && file.path().back() != '/' ? file.path() + '/' : file.path();
-    }
-
     QString fixedRemotePath(const FilePath &file, const QString &remoteHost) const
     {
         return remoteHost + ':' + file.path();
diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp
index 3c2649bf419..3d02ed06142 100644
--- a/src/plugins/texteditor/texteditor.cpp
+++ b/src/plugins/texteditor/texteditor.cpp
@@ -4142,6 +4142,7 @@ void TextEditorWidgetPrivate::registerActions()
                               .contextAction();
     m_visualizeWhitespaceAction = ActionBuilder(this, VISUALIZE_WHITESPACE)
                                       .setContext(m_editorContext)
+                                      .setCheckable(true)
                                       .addOnToggled(
                                           this,
                                           [this](bool checked) {
@@ -4157,6 +4158,7 @@ void TextEditorWidgetPrivate::registerActions()
                               .contextAction();
     m_textWrappingAction = ActionBuilder(this, TEXT_WRAPPING)
                                .setContext(m_editorContext)
+                               .setCheckable(true)
                                .addOnToggled(
                                    this,
                                    [this](bool checked) {
diff --git a/src/plugins/texteditor/texteditorplugin.cpp b/src/plugins/texteditor/texteditorplugin.cpp
index 5df9de54701..c774fed0438 100644
--- a/src/plugins/texteditor/texteditorplugin.cpp
+++ b/src/plugins/texteditor/texteditorplugin.cpp
@@ -453,7 +453,8 @@ void TextEditorPlugin::createEditorCommands()
     TextActionBuilder(this, VISUALIZE_WHITESPACE)
         .setText(Tr::tr("&Visualize Whitespace"))
         .setDefaultKeySequence(Tr::tr("Meta+E, Meta+V"), Tr::tr("Ctrl+E, Ctrl+V"))
-        .addToContainer(M_EDIT_ADVANCED, G_EDIT_FORMAT);
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_FORMAT)
+        .setCheckable(true);
     TextActionBuilder(this, CLEAN_WHITESPACE)
         .setText(Tr::tr("Clean Whitespace"))
         .addToContainer(M_EDIT_ADVANCED, G_EDIT_FORMAT);
diff --git a/tests/system/suite_HELP/tst_HELP02/test.py b/tests/system/suite_HELP/tst_HELP02/test.py
index b6246e4f05e..66ac3c0ea7b 100644
--- a/tests/system/suite_HELP/tst_HELP02/test.py
+++ b/tests/system/suite_HELP/tst_HELP02/test.py
@@ -37,7 +37,7 @@ def getQtCreatorVersionFromFile():
 
 def checkQtCreatorHelpVersion(expectedVersion):
     def rightStart(x):
-        return x.startswith('Qt Creator Manual')
+        return x.startswith('Qt Creator Documentation')
 
     switchViewTo(ViewConstants.HELP)
     try:
@@ -45,7 +45,7 @@ def checkQtCreatorHelpVersion(expectedVersion):
         waitFor("any(map(rightStart, dumpItems(helpContentWidget.model())))", 10000)
         items = dumpItems(helpContentWidget.model())
         test.compare(next(iter(filter(rightStart, items))),
-                     'Qt Creator Manual %s' % expectedVersion,
+                     'Qt Creator Documentation %s' % expectedVersion,
                      'Verifying whether manual uses expected version.')
     except:
         t, v = sys.exc_info()[:2]
diff --git a/tests/system/suite_HELP/tst_HELP06/test.py b/tests/system/suite_HELP/tst_HELP06/test.py
index 0cdcbb653af..1c32e467d23 100644
--- a/tests/system/suite_HELP/tst_HELP06/test.py
+++ b/tests/system/suite_HELP/tst_HELP06/test.py
@@ -17,7 +17,7 @@ def invokeContextMenuItemOnBookmarkFolder(view, item, menuItem):
                                    "window=':Add Bookmark_BookmarkDialog'}", menuItem))
 
 def textForQtVersion(text):
-    suffix = "Qt Creator Manual"
+    suffix = "Qt Creator Documentation"
     if text != suffix:
         text += " | " + suffix
     return text
@@ -28,15 +28,14 @@ def main():
         return
     # goto help mode and click on topic
     switchViewTo(ViewConstants.HELP)
-    manualQModelIndex = getQModelIndexStr("text?='Qt Creator Manual *'",
+    manualQModelIndex = getQModelIndexStr("text?='Qt Creator Documentation *'",
                                           ":Qt Creator_QHelpContentWidget")
     manualQMIObj = waitForObject(manualQModelIndex)
     doubleClick(manualQMIObj, 5, 5, 0, Qt.LeftButton)
     if not waitFor("not manualQMIObj.collapsed", 2000):
         test.warning("It takes more than two seconds to expand the help content tree.")
-    devQModelIndex = getQModelIndexStr("text='Developing with Qt Creator'", manualQModelIndex)
-    doubleClick(devQModelIndex)
-    gettingStartedQModelIndex = getQModelIndexStr("text='Getting Started'", devQModelIndex)
+
+    gettingStartedQModelIndex = getQModelIndexStr("text='Getting Started'", manualQModelIndex)
     doubleClick(gettingStartedQModelIndex)
     pageTitle = "Configuring Qt Creator"
     mouseClick(waitForObject(getQModelIndexStr("text='%s'" % pageTitle,
@@ -80,7 +79,7 @@ def main():
     configQModelIndex = getQModelIndexStr("text?='%s'" % textForQtVersion("%s*" % pageTitle),
                                           folder2QModelIndex)
     newFolderQModelIndex = getQModelIndexStr("text='New Folder'", sampleQModelIndex)
-    manualQModelIndex = getQModelIndexStr("text='%s'" % textForQtVersion("Qt Creator Manual"),
+    manualQModelIndex = getQModelIndexStr("text='%s'" % textForQtVersion("Qt Creator Documentation"),
                                              newFolderQModelIndex)
     test.verify(checkIfObjectExists(sampleQModelIndex, verboseOnFail = True) and
                 checkIfObjectExists(folder1QModelIndex, verboseOnFail = True) and
@@ -99,7 +98,7 @@ def main():
     type(waitForObject(":Qt Creator_Bookmarks_TreeView"), "<Right>")
     type(waitForObject(":Qt Creator_Bookmarks_TreeView"), "<Down>")
     type(waitForObject(":Qt Creator_Bookmarks_TreeView"), "<Return>")
-    test.verify(textForQtVersion("Qt Creator Manual") in getHelpTitle(),
+    test.verify(textForQtVersion("Qt Creator Documentation") in getHelpTitle(),
                 "Verifying if second bookmark is opened")
     # delete previously created directory
     clickButton(waitForObject(":Qt Creator.Add Bookmark_QToolButton"))
diff --git a/tests/system/suite_WELP/tst_WELP01/test.py b/tests/system/suite_WELP/tst_WELP01/test.py
index 8385c33fa96..89ee6dbd1e3 100644
--- a/tests/system/suite_WELP/tst_WELP01/test.py
+++ b/tests/system/suite_WELP/tst_WELP01/test.py
@@ -75,7 +75,7 @@ def main():
     wsButton = getWelcomeScreenSideBarButton(getStarted)
     if test.verify(object.exists(wsButton),
                    "Verifying: Qt Creator displays Welcome Page with '%s' button." % getStarted):
-        if clickItemVerifyHelpCombo(wsButton, "Getting Started | Qt Creator Manual",
+        if clickItemVerifyHelpCombo(wsButton, "Getting Started \| Qt Creator Documentation",
                                     "Verifying: Help with Creator Documentation is being opened."):
 
             textUrls = {'Online Community':'https://forum.qt.io',
@@ -92,7 +92,7 @@ def main():
     wsButton = getWelcomeScreenSideBarButton(getStarted)
     if object.exists(wsButton):
         mouseClick(wsButton)
-        qcManualQModelIndexStr = getQModelIndexStr("text~='Qt Creator Manual [0-9.]+'",
+        qcManualQModelIndexStr = getQModelIndexStr("text~='Qt Creator Documentation [0-9.]+'",
                                                    ":Qt Creator_QHelpContentWidget")
         if str(waitForObject(":Qt Creator_HelpSelector_QComboBox").currentText) == "(Untitled)":
             mouseClick(qcManualQModelIndexStr)