diff --git a/doc/qtcreator/images/icons/message.png b/doc/qtcreator/images/icons/message.png
new file mode 100644
index 00000000000..4cf36b6092c
Binary files /dev/null and b/doc/qtcreator/images/icons/message.png differ
diff --git a/src/plugins/coreplugin/images/logo/16/Qt_logo_green.png b/doc/qtcreator/images/icons/qtlogo-16.png
similarity index 100%
rename from src/plugins/coreplugin/images/logo/16/Qt_logo_green.png
rename to doc/qtcreator/images/icons/qtlogo-16.png
diff --git a/doc/qtcreator/images/icons/savefile.png b/doc/qtcreator/images/icons/savefile.png
new file mode 100644
index 00000000000..d23d62adc42
Binary files /dev/null and b/doc/qtcreator/images/icons/savefile.png differ
diff --git a/doc/qtcreator/images/icons/stopwatch.png b/doc/qtcreator/images/icons/stopwatch.png
new file mode 100644
index 00000000000..5363b789e80
Binary files /dev/null and b/doc/qtcreator/images/icons/stopwatch.png differ
diff --git a/doc/qtcreator/images/qtcreator-build-cmake-output.png b/doc/qtcreator/images/qtcreator-build-cmake-output.png
index 4311c61249a..80040e8bfe6 100644
Binary files a/doc/qtcreator/images/qtcreator-build-cmake-output.png and b/doc/qtcreator/images/qtcreator-build-cmake-output.png differ
diff --git a/doc/qtcreator/images/qtcreator-build-configurations.png b/doc/qtcreator/images/qtcreator-build-configurations.png
index a1c2d7de82c..8ca5f7054df 100644
Binary files a/doc/qtcreator/images/qtcreator-build-configurations.png and b/doc/qtcreator/images/qtcreator-build-configurations.png differ
diff --git a/doc/qtcreator/images/qtcreator-build-steps-cmake-ninja.png b/doc/qtcreator/images/qtcreator-build-steps-cmake-ninja.png
deleted file mode 100644
index 0f1ba4fa745..00000000000
Binary files a/doc/qtcreator/images/qtcreator-build-steps-cmake-ninja.png and /dev/null differ
diff --git a/doc/qtcreator/images/qtcreator-cmake-build-settings-initial.png b/doc/qtcreator/images/qtcreator-cmake-build-settings-initial.png
index ce7f75f881f..90c632411b3 100644
Binary files a/doc/qtcreator/images/qtcreator-cmake-build-settings-initial.png and b/doc/qtcreator/images/qtcreator-cmake-build-settings-initial.png differ
diff --git a/doc/qtcreator/images/qtcreator-cmake-build-settings.png b/doc/qtcreator/images/qtcreator-cmake-build-settings.png
index 5d6968b2cf5..30491794188 100644
Binary files a/doc/qtcreator/images/qtcreator-cmake-build-settings.png and b/doc/qtcreator/images/qtcreator-cmake-build-settings.png differ
diff --git a/doc/qtcreator/images/qtcreator-cmake-generator.png b/doc/qtcreator/images/qtcreator-cmake-generator.png
new file mode 100644
index 00000000000..19c883bcb5b
Binary files /dev/null and b/doc/qtcreator/images/qtcreator-cmake-generator.png differ
diff --git a/doc/qtcreator/images/qtcreator-cmake-kit-configuration.png b/doc/qtcreator/images/qtcreator-cmake-kit-configuration.png
new file mode 100644
index 00000000000..6a305822caf
Binary files /dev/null and b/doc/qtcreator/images/qtcreator-cmake-kit-configuration.png differ
diff --git a/doc/qtcreator/images/qtcreator-find-incremental.png b/doc/qtcreator/images/qtcreator-find-incremental.png
new file mode 100644
index 00000000000..3bb17a1a41f
Binary files /dev/null and b/doc/qtcreator/images/qtcreator-find-incremental.png differ
diff --git a/doc/qtcreator/images/qtcreator-git-log.png b/doc/qtcreator/images/qtcreator-git-log.png
index d58051cc34d..d628639b7c1 100644
Binary files a/doc/qtcreator/images/qtcreator-git-log.png and b/doc/qtcreator/images/qtcreator-git-log.png differ
diff --git a/doc/qtcreator/images/qtcreator-logging-category-viewer.png b/doc/qtcreator/images/qtcreator-logging-category-viewer.png
new file mode 100644
index 00000000000..4a88efd9b57
Binary files /dev/null and b/doc/qtcreator/images/qtcreator-logging-category-viewer.png differ
diff --git a/doc/qtcreator/images/qtcreator-project-kits.png b/doc/qtcreator/images/qtcreator-project-kits.png
index 569425e742b..e6c1434c9cc 100644
Binary files a/doc/qtcreator/images/qtcreator-project-kits.png and b/doc/qtcreator/images/qtcreator-project-kits.png differ
diff --git a/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc b/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc
index 31e4780e608..8b72312a817 100644
--- a/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc
+++ b/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2021 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -31,17 +31,31 @@
     \title CMake Build Configuration
 
     Configuring medium-sized to large CMake projects in \QC can be a
-    challenge due to the number of options that you need to pass to
+    challenge due to the number of variables that you need to pass to
     CMake to configure the project correctly. To make this easier,
     \QC creates an initial configuration for you based on the kit
-    settings and displays it in the \uicontrol {Initial CMake parameters}
-    field and in a table that lists the parameter names and values.
+    settings and displays it in \uicontrol {Initial Configuration} in
+    the \l{Specifying Build Settings}{Build Settings} of the project.
 
     \image qtcreator-cmake-build-settings-initial.png "CMake build settings"
 
-    Parameter names are listed in the \uicontrol Key column. Names with a
-    common prefix (up to the first underscore character) are grouped under
-    the prefix.
+    You can view and edit the actual values of the variables that are passed
+    to CMake. Variable names are listed in the \uicontrol Key column and their
+    current values in the \uicontrol Value column. For more information
+    about the available variables, see \l{CMake: cmake-variables(7)}.
+    For more information about Qt-specific variables, see
+    \l{CMake Variable Reference}.
+
+    You can specify additional CMake options, such as \c {--find-debug},
+    \c {--preset}, \c {--trace-expand}, or \c {--warn-uninitialized}, in
+    \uicontrol {Additional CMake options}. For more information about
+    the available options, see \l{CMake: cmake(1)}.
+
+    After successfully running CMake, you can view and modify the current
+    configuration in \uicontrol {Current Configuration}.
+
+    Select \uicontrol {Kit Configuration} to edit the CMake settings for the
+    build and run kit selected for the project.
 
     \section1 Multi-Config Support
 
@@ -59,35 +73,36 @@
 
     When developing with Qt 6 for iOS, only the Xcode generator is supported.
 
-    \section1 Modifying Initial Parameters
+    \section1 Modifying Variable Values
 
-    In the \uicontrol Value column, you can view and edit the actual values
-    of the parameters that are passed to CMake.
+    You can view and edit the actual values of the variables that
+    are passed to CMake in \uicontrol {Initial Configuration} or
+    \uicontrol {Current Configuration}.
 
-    \image qtcreator-cmake-build-settings.png "CMake parameters"
+    \image qtcreator-cmake-build-settings.png "CMake variables"
 
-    To view all parameters, select the \uicontrol Advanced check box.
+    To view all variables, select the \uicontrol Advanced check box.
 
-    To add parameters, select \uicontrol Add, and then select the type of
-    the parameter that you are adding: \uicontrol Boolean, \uicontrol String,
+    To add variables, select \uicontrol Add, and then select the type of
+    the variable that you are adding: \uicontrol Boolean, \uicontrol String,
     \uicontrol Directory, or \uicontrol File.
 
-    To change the type of the selected parameter, right-click the
-    parameter name in the \uicontrol Key column, and then select
+    To change the type of the selected variable, right-click the
+    variable name in the \uicontrol Key column, and then select
     \uicontrol {Force to bool}, \uicontrol {Force to file},
     \uicontrol {Force to directory}, or \uicontrol {Force to string}
     in the context menu.
 
-    To copy the name or value of the selected parameter to the clipboard,
+    To copy the name or value of the selected variable to the clipboard,
     select \uicontrol Copy in the context menu.
 
-    To modify the value of a parameter, double-click it, or select it,
+    To modify the value of a variable, double-click it, or select it,
     and then select \uicontrol Edit.
 
-    You can apply actions to multiple parameters at a time. To clear
+    You can apply actions to multiple variables at a time. To clear
     the selection, select \uicontrol {Clear Selection}.
 
-    To remove the selected parameters, select \uicontrol Unset. To undo
+    To remove the selected variables, select \uicontrol Unset. To undo
     the removal, select \uicontrol Set.
 
     To reset all the changes that you made, select \uicontrol Reset.
@@ -95,23 +110,27 @@
     To modify the environment variable values for the CMake build environment,
     select \uicontrol {Batch Edit}. For more information, see \l{Batch Editing}.
 
-    To save the changes, select \uicontrol {Apply Configuration Changes}.
-    Keep in mind that a configuration change might trigger a follow-up
-    configuration change.
+    To build using the current configuration, select \uicontrol {Run CMake}.
+    While building, the button text changes to \uicontrol {Stop CMake}. Select
+    the button to cancel the current build.
 
-    The parameter values that you change are passed via \c -D<option>=<value>
+    The variable values that you change are passed via \c -D<option>=<value>
     to CMake, which stores the options in the CMakeCache.txt file. This means
-    that if you remove the build directory, all the custom parameters that are
-    not part of the initial CMake parameters are also removed.
+    that if you remove the build directory, all the custom variables that are
+    not part of the initial CMake configuration are also removed.
 
-    To reconfigure a project using the modified parameters,
+    To reconfigure a project using the modified variable values,
     select \uicontrol Build > \uicontrol {Clear CMake Configuration}, which
     removes the CMakeCache.txt file. This enables you to do a full rebuild.
 
-    \section1 Re-configuring with Initial Parameters
+    \section1 Re-configuring with Initial Variables
 
-    To reset CMake parameters to the initial ones, select
-    \uicontrol {Re-configure with Initial Parameters}.
+    To reset CMake variables to the initial ones, select
+    \uicontrol {Re-configure with Initial Variables} in
+    \uicontrol {Initial Configuration}. \QC deletes the current CMake
+    configuration and runs CMake. The initial configuration values are
+    stored in the CMakeLists.txt.user file, so deleting a build directory
+    does not delete the initial configuration.
 
     To be asked before \QC resets the changes, select \uicontrol Tools >
     \uicontrol Options > \uicontrol {Build & Run} > \uicontrol CMake >
@@ -167,14 +186,16 @@
         \li Install Ninja.
         \li Add the path to the Ninja executable to the value of the PATH system
             variable.
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Kits, and
-            then select the build and run kit for the project.
+        \li In \uicontrol Projects > \uicontrol {Build & Run} > \uicontrol Build
+            > \uicontrol {Build Settings}, select \uicontrol {Kit Configuration}.
+            \image qtcreator-cmake-kit-configuration.png "Kit CMake Configuration dialog"
         \li Select \uicontrol Change next to the \uicontrol {CMake generator}
             field to open the \uicontrol {CMake Generator} dialog.
-            \image qtcreator-build-steps-cmake-ninja.png
-        \li In the \uicontrol Generator field, select \uicontrol Ninja.
-        \li Select \uicontrol OK to return to the \uicontrol Kits tab.
-        \li Select \uicontrol OK or \uicontrol Apply to save your changes.
+            \image qtcreator-cmake-generator.png "CMake Generator dialog"
+        \li In \uicontrol Generator, select \uicontrol Ninja.
+        \li Select \uicontrol OK to save your changes and close the dialog.
+        \li Close the \uicontrol {Kit CMake Configuration} dialog to return to
+            \uicontrol {Build Settings}.
     \endlist
 
     \note To make sure that old build artifacts don't get in the way
diff --git a/doc/qtcreator/src/editors/creator-search.qdoc b/doc/qtcreator/src/editors/creator-search.qdoc
index 4f9cf514656..7a1e7dd9de3 100644
--- a/doc/qtcreator/src/editors/creator-search.qdoc
+++ b/doc/qtcreator/src/editors/creator-search.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -37,7 +37,9 @@
         \li Press \key {Ctrl+F} or select \uicontrol Edit >
             \uicontrol {Find/Replace} > \uicontrol {Find/Replace}.
 
-        \li Enter the text you are looking for.
+        \li In \uicontrol Find, enter the text you are looking for.
+
+            \image qtcreator-find-incremental.png
 
             If the text is found, all occurrences are highlighted as you type.
 
@@ -46,10 +48,14 @@
             occurrence click \inlineimage icons/prev.png
             (\uicontrol {Find Previous}), or press \key {Shift+F3}.
 
+        \li To select all found occurrences in a file, select
+            \uicontrol {Select All}.
+
     \endlist
 
-    You can restrict the search in the \uicontrol Find field by selecting one
-    or several search criteria:
+    You can restrict the search in the \uicontrol Find field by selecting
+    \inlineimage icons/qtcreator-new-search-icon.png
+    . Select one or several search criteria:
 
     \list
 
@@ -114,6 +120,8 @@
     \uicontrol Tools > \uicontrol Options > \uicontrol {Text Editor} >
     \uicontrol Display > \uicontrol {Highlight search results on the scrollbar}.
 
+    To search using more advanced options, select \uicontrol Advanced.
+
     \section1 Advanced Search
 
     To search through projects, files on a file system, files in all project
diff --git a/doc/qtcreator/src/external-resources/external-resources.qdoc b/doc/qtcreator/src/external-resources/external-resources.qdoc
index 4bc40bc9d67..c0c52f936d5 100644
--- a/doc/qtcreator/src/external-resources/external-resources.qdoc
+++ b/doc/qtcreator/src/external-resources/external-resources.qdoc
@@ -113,6 +113,14 @@
     \externalpage https://doc.qt.io/QtApplicationManager/
     \title Qt Application Manager
 */
+/*!
+    \externalpage https://cmake.org/cmake/help/latest/manual/cmake.1.html
+    \title CMake: cmake(1)
+*/
+/*!
+    \externalpage https://cmake.org/cmake/help/latest/manual/cmake-variables.7.html
+    \title CMake: cmake-variables(7)
+*/
 /*!
     \externalpage https://cmake.org/cmake/help/latest/command/install.html
     \title CMake: install command
diff --git a/doc/qtcreator/src/howto/creator-only/creator-logging-viewer.qdoc b/doc/qtcreator/src/howto/creator-only/creator-logging-viewer.qdoc
new file mode 100644
index 00000000000..963449be581
--- /dev/null
+++ b/doc/qtcreator/src/howto/creator-only/creator-logging-viewer.qdoc
@@ -0,0 +1,97 @@
+/****************************************************************************
+**
+** Copyright (C) 2022 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt Creator documentation.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
+**
+****************************************************************************/
+
+/*!
+    \page creator-logging-viewer.html
+    \if defined(qtdesignstudio)
+    \previouspage creator-quick-ui-forms.html
+    \else
+    \previouspage creator-task-lists.html
+    \endif
+    \nextpage creator-telemetry.html
+
+    \title Inspecting Internal Logs
+
+    You can inspect internal log messages of \QC at runtime without having to
+    restart it or configure the logging rules. Log messages are helpful when
+    you develop \QC, need to investigate some problem you are facing, or want
+    to take a look behind the scenes.
+
+    To open the log viewer and start collecting log information, select
+    \uicontrol Tools > \uicontrol {Debug \QC} > \uicontrol {Show Logs}.
+
+    \image qtcreator-logging-category-viewer.png
+
+    The viewer displays log messages from the selected logging categories.
+    If you have logging rules defined, they might be listed on startup.
+    Otherwise, the list of categories is extended while you are using \QC.
+
+    \note Messages are not cached, so the viewer displays only messages that
+    are recorded after you enabled a category.
+
+    \section1 Viewing Logs
+
+    To enable logging categories, select them in \uicontrol Category.
+    \uicontrol Type specifies the minimum level of messages to display from
+    the respective category. To change the minimum level, double-click the
+    type and select another value.
+
+    If you enable more than one category, you can specify different colors for
+    the messages in each category. Double-click the value of \uicontrol Color to
+    pick colors for the categories.
+
+    To store information about the currently enabled categories, select
+    \uicontrol {Save Enabled as Preset} in the context-menu. To load the
+    saved information, select \uicontrol {Update from Preset}.
+
+    To save the content of the displayed messages, select
+    \inlineimage icons/savefile.png
+    (\uicontrol {Save Log}). To copy all or selected messages, select
+    \uicontrol {Copy All} or \uicontrol {Copy Selected Logs} in the
+    context menu.
+
+    To clean the content of displayed messages select
+    \inlineimage icons/clean_pane_small.png
+    (\uicontrol Clear).
+
+    To temporarily stop logging, select \inlineimage icons/stop_small.png
+    (\uicontrol {Stop Logging}). To continue logging, select
+    \inlineimage icons/run_small.png
+    (\uicontrol {Start Logging}).
+
+    By default, logging categories and messages coming directly from Qt are
+    disabled. To display them, select \inlineimage icons/qtlogo-16.png
+    (\uicontrol {Toggle logging of Qt internal loggings.})
+
+    New messages automatically scroll the message display to the bottom.
+    To stop automatic scrolling, toggle \inlineimage icons/arrowdown.png
+    (\uicontrol {Auto Scroll}).
+
+    By default, messages are listed with a timestamp, without message
+    type. To hide and show this information, toggle
+    \inlineimage icons/stopwatch.png
+    (\uicontrol Timestamps) and \inlineimage icons/message.png
+    (\uicontrol {Message Types}).
+*/
diff --git a/doc/qtcreator/src/howto/creator-only/creator-task-lists.qdoc b/doc/qtcreator/src/howto/creator-only/creator-task-lists.qdoc
index cc61374e7c3..e337a155739 100644
--- a/doc/qtcreator/src/howto/creator-only/creator-task-lists.qdoc
+++ b/doc/qtcreator/src/howto/creator-only/creator-task-lists.qdoc
@@ -32,7 +32,7 @@
 /*!
     \previouspage creator-editor-external.html
     \page creator-task-lists.html
-    \nextpage creator-telemetry.html
+    \nextpage creator-logging-viewer.html
 
     \title Showing Task List Files in Issues Pane
 
diff --git a/doc/qtcreator/src/howto/creator-telemetry.qdoc b/doc/qtcreator/src/howto/creator-telemetry.qdoc
index 8ae161c74e3..23e01ca7b8e 100644
--- a/doc/qtcreator/src/howto/creator-telemetry.qdoc
+++ b/doc/qtcreator/src/howto/creator-telemetry.qdoc
@@ -28,7 +28,7 @@
     \if defined(qtdesignstudio)
     \previouspage creator-quick-ui-forms.html
     \else
-    \previouspage creator-task-lists.html
+    \previouspage creator-logging-viewer.html
     \endif
     \nextpage collecting-usage-statistics.html
 
diff --git a/doc/qtcreator/src/linux-mobile/creator-deployment-embedded-linux.qdoc b/doc/qtcreator/src/linux-mobile/creator-deployment-embedded-linux.qdoc
index f149f741db5..db241e9c60d 100644
--- a/doc/qtcreator/src/linux-mobile/creator-deployment-embedded-linux.qdoc
+++ b/doc/qtcreator/src/linux-mobile/creator-deployment-embedded-linux.qdoc
@@ -57,7 +57,7 @@
 
     The process to add files to deploy depends on the build system you use.
 
-    \section2 CMake
+    \section2 CMake Builds
 
     When using CMake as the build system, use the \l{CMake: install command}
     {install} command in the CMakeLists.txt file to add the missing files.
@@ -75,7 +75,7 @@
     )
     \endcode
 
-    \section2 qmake
+    \section2 qmake Builds
 
     When using qmake, edit the \l{Variables#installs}{INSTALLS variable} in
     the project \c .pro file.
diff --git a/doc/qtcreator/src/overview/creator-only/creator-advanced.qdoc b/doc/qtcreator/src/overview/creator-only/creator-advanced.qdoc
index c5eb81598c3..b64bc842677 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-advanced.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-advanced.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2021 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -95,6 +95,11 @@
             corresponding source code by clicking the error message or by using
             keyboard shortcuts.
 
+        \li \l{Inspecting Internal Logs}
+
+            You can inspect internal log messages of \QC. They may be
+            helpful when developing \QC or investigating problems.
+
         \li \l{Managing Data Collection}
 
             If you agreed to pseudonymous data collection during \QC
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-generic.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-generic.qdoc
index 2f72728562d..984161fd510 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-generic.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-generic.qdoc
@@ -113,6 +113,16 @@
     git ls-files "*.cpp" "*.h" > MyProject.files
     \endcode
 
+    \section2 Precompiled Headers
+
+    To use precompiled headers in a generic project, add the \c pch tag after
+    a file path in the \c .files file, separated by the pipe character (|).
+    For example:
+
+    \badcode
+    src/pch.h|pch
+    \endcode
+
     \section1 Specifying Include Paths and Framework Paths
 
     The include paths are specified in the \tt{.includes} file, one include
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc
index 81f3ebce5bf..26243853820 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2021 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -57,9 +57,11 @@
 
     \section1 Managing Build Configurations
 
+    Specify build settings in \uicontrol Projects > \uicontrol {Build & Run}
+    > \uicontrol Build > \uicontrol {Build Settings}.
+
     \image qtcreator-build-configurations.png "Build Settings"
 
-    You specify build settings in the \uicontrol Projects mode.
     To add a new build configuration, click \uicontrol Add and select the type of
     configuration you would like to add. The options you have depend on the
     build system that you selected for the project. You can add as many build
diff --git a/doc/qtcreator/src/qtcreator-toc.qdoc b/doc/qtcreator/src/qtcreator-toc.qdoc
index bab4568bbae..ed38c906cf1 100644
--- a/doc/qtcreator/src/qtcreator-toc.qdoc
+++ b/doc/qtcreator/src/qtcreator-toc.qdoc
@@ -228,6 +228,7 @@
             \li \l{Keyboard Shortcuts}
             \li \l{Using External Tools}
             \li \l{Showing Task List Files in Issues Pane}
+            \li \l{Inspecting Internal Logs}
             \li \l{Managing Data Collection}
                 \list
                     \li \l {Collecting Usage Statistics}
diff --git a/doc/qtcreator/src/vcs/creator-vcs-git.qdoc b/doc/qtcreator/src/vcs/creator-vcs-git.qdoc
index c27ca66fa2b..28ff2daa27f 100644
--- a/doc/qtcreator/src/vcs/creator-vcs-git.qdoc
+++ b/doc/qtcreator/src/vcs/creator-vcs-git.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2021 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -107,8 +107,11 @@
     algorithm for calculating the differences, select \uicontrol Patience.
     To only show text changes, select \uicontrol {Ignore Whitespace}.
 
-    To filter log entries by the text in the commit message or by strings that
-    were added or removed, select \uicontrol Filter.
+    To filter log entries by the text in the commit message, by strings that
+    were added or removed, or by author, select \uicontrol Filter. Enter a
+    search sting in the \uicontrol {Filter by message},
+    \uicontrol {Filter by content}, or \uicontrol {Filter by author} field.
+    Select \uicontrol {Case Sensitive} to make filtering consider case.
 
     To follow only the first parent on merge commits, select
     \uicontrol {First Parent}.
@@ -116,6 +119,9 @@
     To toggle between textual and visual representation of the log, select
     \uicontrol Graph.
 
+    To toggle color coding of different parts of the log entries, select
+    \uicontrol Color.
+
     To show log also for previous names of the file, select \uicontrol Follow.
 
     Select \inlineimage icons/reload_gray.png
diff --git a/qbs/imports/QtcManualtest.qbs b/qbs/imports/QtcManualtest.qbs
new file mode 100644
index 00000000000..cc21c8e3fa6
--- /dev/null
+++ b/qbs/imports/QtcManualtest.qbs
@@ -0,0 +1,21 @@
+import qbs
+import qbs.FileInfo
+
+QtcProduct {
+    type: ["application"]
+
+    Depends { name: "Qt.testlib" }
+    Depends { name: "copyable_resource" }
+    targetName: "tst_" + name.split(' ').join("")
+
+    cpp.rpaths: [
+        project.buildDirectory + '/' + qtc.ide_library_path,
+        project.buildDirectory + '/' + qtc.ide_plugin_path
+    ]
+    cpp.defines: {
+        var defines = base.filter(function(d) { return d !== "QT_RESTRICTED_CAST_FROM_ASCII"; });
+        return defines;
+    }
+
+    install: false
+}
diff --git a/qtcreator.qbs b/qtcreator.qbs
index 64bc0b741dc..f586a12237b 100644
--- a/qtcreator.qbs
+++ b/qtcreator.qbs
@@ -4,7 +4,7 @@ import qbs.FileInfo
 
 Project {
     name: "Qt Creator"
-    minimumQbsVersion: "1.8.0"
+    minimumQbsVersion: "1.19.0"
     property string minimumMacosVersion: "10.12"
     property bool withAutotests: qbs.buildVariant === "debug"
     property path ide_source_tree: path
diff --git a/scripts/uichanges.py b/scripts/uichanges.py
index 0dcc054a8f3..126cbfc9a31 100755
--- a/scripts/uichanges.py
+++ b/scripts/uichanges.py
@@ -181,6 +181,15 @@ def diffContext(ctx, old, new):
 
     return report
 
+
+def stringify(obj):
+    stringTypes = (str, unicode) if sys.version_info.major == 2 else (str)
+    if isinstance(obj, stringTypes):
+        return obj
+    if isinstance(obj, bytes):
+        tmp = obj.decode('cp1252') if platform.system() in ('Microsoft','Windows') else obj.decode()
+        return tmp
+
 # --- The main program
 
 oldGenerator = Generator()
@@ -203,21 +212,21 @@ newContextSet = set(newTree.keys())
 for c in sorted(oldContextSet.difference(newContextSet)):
     report = diffContext(c, oldTree[c], {})
     if report:
-        print(report.encode('utf-8'))
+        print(stringify(report.encode('utf-8')))
     else:
         unchangedContexts += 1
 
 for c in sorted(newContextSet.difference(oldContextSet)):
     report = diffContext(c, {}, newTree[c])
     if report:
-        print(report.encode('utf-8'))
+        print(stringify(report.encode('utf-8')))
     else:
         unchangedContexts += 1
 
 for c in sorted(newContextSet.intersection(oldContextSet)):
     report = diffContext(c, oldTree[c], newTree[c])
     if report:
-        print(report.encode('utf-8'))
+        print(stringify(report.encode('utf-8')))
     else:
         unchangedContexts += 1
 
diff --git a/share/qtcreator/cplusplus/examples/CMakeLists.txt b/share/qtcreator/cplusplus/examples/CMakeLists.txt
index cafabb6f7cb..004deeded3e 100644
--- a/share/qtcreator/cplusplus/examples/CMakeLists.txt
+++ b/share/qtcreator/cplusplus/examples/CMakeLists.txt
@@ -11,7 +11,10 @@ set(CMAKE_AUTORCC ON)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-find_package(Qt5 COMPONENTS Widgets REQUIRED)
+find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Gui Widgets REQUIRED)
+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui Widgets REQUIRED)
+
+set_property(SOURCE clazy_example.cpp icontest.cpp PROPERTY SKIP_AUTOMOC ON)
 
 add_executable(examples
   clazy_example.cpp
@@ -20,4 +23,4 @@ add_executable(examples
   tidy_example.h
 )
 
-target_link_libraries(examples PRIVATE Qt5::Widgets)
+target_link_libraries(examples PRIVATE Qt${QT_VERSION_MAJOR}::Widgets)
diff --git a/share/qtcreator/cplusplus/examples/clazy_example.cpp b/share/qtcreator/cplusplus/examples/clazy_example.cpp
index 3fef3cb8a5a..bf1cbe2e61c 100644
--- a/share/qtcreator/cplusplus/examples/clazy_example.cpp
+++ b/share/qtcreator/cplusplus/examples/clazy_example.cpp
@@ -113,9 +113,6 @@ TestObject::TestObject()
     for (auto obj : list) {
     }
 
-    // -Wclazy-qdatetime-utc
-    QDateTime::currentDateTime().toTime_t();
-
     // -Wclazy-qfileinfo-exists
     // -Wclazy-qstring-allocations
     QFileInfo("filename").exists();
@@ -134,8 +131,5 @@ TestObject::TestObject()
     str.mid(5).toInt(&ok);
 
     // -Wclazy-qstring-arg
-    QString("%1 %2").arg("1").arg("2");
+    (void) QString("%1 %2").arg("1").arg("2");
 }
-
-// Note: A fatal error like an unresolved include will make clazy stop emitting any diagnostics.
-// #include "clazy_example.moc"
diff --git a/share/qtcreator/cplusplus/examples/icontest.cpp b/share/qtcreator/cplusplus/examples/icontest.cpp
index 2aea615fd24..764c920b938 100644
--- a/share/qtcreator/cplusplus/examples/icontest.cpp
+++ b/share/qtcreator/cplusplus/examples/icontest.cpp
@@ -27,12 +27,13 @@
 
 #define Macro
 
-class Class {
+class Class : public QObject {
     Q_OBJECT
+
 public:
-    Q_PROPERTY(bool property READ readProperty CONSTANT);
-    void publicFunction();
-    void static publicStaticFunction();
+    Q_PROPERTY(int property READ publicStaticFunction CONSTANT)
+    int publicFunction() { return 0; }
+    int static publicStaticFunction()  { return 0; }
     template<int> void publicTemplateFunction();
     template<int> void static publicStaticTemplateFunction();
 
@@ -43,8 +44,8 @@ signals:
     void signal();
 
 public slots:
-    void publicSlot();
-    template<int> void publicTemplateSlot();
+    void publicSlot() {}
+    // template<int> void publicTemplateSlot() {}
 
 protected:
     void protectedFunction();
@@ -56,8 +57,8 @@ protected:
     int static protectedStaticVariable;
 
 protected slots:
-    void protectedSlot();
-    template<int> void protectedTemplateSlot();
+    void protectedSlot() {}
+    // template<int> void protectedTemplateSlot() {}
 
 private:
     void privateFunction();
@@ -67,9 +68,10 @@ private:
     template<int> void static privateStaticTemplateFunction();
 
 private slots:
-    void privateSlot();
-    template<int> void privateTemplateSlot();
+    void privateSlot() {}
+    // template<int> void privateTemplateSlot() {}
 
+private:
     int privateVariable;
     int static privateStaticVariable;
 };
diff --git a/share/qtcreator/cplusplus/examples/tidy_example.cpp b/share/qtcreator/cplusplus/examples/tidy_example.cpp
index dc921114ea1..0a814411ce6 100644
--- a/share/qtcreator/cplusplus/examples/tidy_example.cpp
+++ b/share/qtcreator/cplusplus/examples/tidy_example.cpp
@@ -71,7 +71,7 @@ public:
     // misc-noexcept-move-constructor
     // misc-unconventional-assign-operator
     // misc-unused-parameters
-    Base operator=(Base &&param) {}
+    Base operator=(Base &&param) { return {}; }
     virtual int function()
     {
         // modernize-use-nullptr
@@ -116,7 +116,7 @@ void afterMove(Base &&base)
     Base moved(std::move(base));
 
     // misc-use-after-move
-    base.value;
+    (void) base.value;
 }
 
 // google-runtime-references
@@ -144,7 +144,7 @@ public:
         auto b = {0.5f, 0.5f, 0.5f, 0.5f};
 
         // misc-fold-init-type
-        std::accumulate(std::begin(b), std::end(b), 0);
+        (void) std::accumulate(std::begin(b), std::end(b), 0);
 
         // google-readability-casting, misc-incorrect-roundings
         auto c = (int)(getDouble() + 0.5);
@@ -197,6 +197,7 @@ public:
         std::system("echo ");
         // cert-err52-cpp
         setjmp(nullptr);
+        return 0;
     }
 
     // google-default-arguments
@@ -251,7 +252,7 @@ int main()
     // modernize-loop-convert
     for (int i = 0; i < 3; ++i) {
         // cppcoreguidelines-pro-bounds-constant-array-index
-        arr[i];
+        (void) arr[i];
     }
 
     std::vector<std::pair<int, int>> w;
diff --git a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp
index 96997e03d99..3213d507862 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp
@@ -556,7 +556,12 @@ bool isSubclassOf(QObject *object, const QByteArray &superTypeName)
 
 void getPropertyCache(QObject *object, QQmlEngine *engine)
 {
+#if QT_VERSION < QT_VERSION_CHECK(6, 4, 0)
     QQuickDesignerSupportProperties::getPropertyCache(object, engine);
+#else
+    Q_UNUSED(engine);
+    QQuickDesignerSupportProperties::getPropertyCache(object);
+#endif
 }
 
 void registerNotifyPropertyChangeCallBack(void (*callback)(QObject *, const PropertyName &))
diff --git a/share/qtcreator/qmldesigner/itemLibraryQmlSources/Assets.qml b/share/qtcreator/qmldesigner/itemLibraryQmlSources/Assets.qml
index ab403d203b2..115309c1277 100644
--- a/share/qtcreator/qmldesigner/itemLibraryQmlSources/Assets.qml
+++ b/share/qtcreator/qmldesigner/itemLibraryQmlSources/Assets.qml
@@ -90,6 +90,103 @@ Item {
         selectedAssetsChanged()
     }
 
+    RegExpValidator {
+        id: folderNameValidator
+        regExp: /^(\w[^*/><?\\|:]*)$/
+    }
+
+    Dialog {
+        id: renameFolderDialog
+
+        title: qsTr("Rename folder")
+        anchors.centerIn: parent
+        closePolicy: Popup.CloseOnEscape
+        implicitWidth: 280
+        modal: true
+
+        property bool renameError: false
+
+        contentItem: Column {
+            spacing: 2
+
+            StudioControls.TextField {
+                id: folderRename
+
+                actionIndicator.visible: false
+                translationIndicator.visible: false
+                width: renameFolderDialog.width - 12
+                validator: folderNameValidator
+
+                onEditChanged: renameFolderDialog.renameError = false
+                Keys.onEnterPressed: btnRename.onClicked()
+                Keys.onReturnPressed: btnRename.onClicked()
+            }
+
+            Text {
+                text: qsTr("Folder Name cannot be empty.")
+                color: "#ff0000"
+                visible: folderRename.text === "" && !renameFolderDialog.renameError
+            }
+
+            Text {
+                text: qsTr("Could not rename directory. Make sure no folder with the same name exists.")
+                wrapMode: Text.WordWrap
+                width: renameFolderDialog.width
+                color: "#ff0000"
+                visible: renameFolderDialog.renameError
+            }
+
+            Item { // spacer
+                width: 1
+                height: 10
+            }
+
+            Text {
+                text: qsTr("If the folder has assets in use, renaming it might cause the project to not work correctly.")
+                color: StudioTheme.Values.themeTextColor
+                wrapMode: Text.WordWrap
+                width: renameFolderDialog.width
+                leftPadding: 10
+                rightPadding: 10
+            }
+
+            Item { // spacer
+                width: 1
+                height: 20
+            }
+
+            Row {
+                anchors.right: parent.right
+
+                Button {
+                    id: btnRename
+
+                    text: qsTr("Rename")
+                    enabled: folderRename.text !== ""
+                    onClicked: {
+                        var success = assetsModel.renameFolder(contextDir.dirPath, folderRename.text)
+                        if (success)
+                            renameFolderDialog.accept()
+
+                        renameFolderDialog.renameError = !success
+                    }
+                }
+
+                Button {
+                    text: qsTr("Cancel")
+                    onClicked: renameFolderDialog.reject()
+                }
+            }
+        }
+
+        onOpened: {
+            folderRename.text = contextDir.dirName
+            folderRename.selectAll()
+            folderRename.forceActiveFocus()
+            renameFolderDialog.renameError = false
+        }
+    }
+
     Dialog {
         id: newFolderDialog
 
@@ -113,6 +210,7 @@ Item {
 
                     actionIndicator.visible: false
                     translationIndicator.visible: false
+                    validator: folderNameValidator
 
                     Keys.onEnterPressed: btnCreate.onClicked()
                     Keys.onReturnPressed: btnCreate.onClicked()
@@ -261,6 +359,13 @@ Item {
                     height: visible ? StudioTheme.Values.border : 0
                 }
 
+                StudioControls.MenuItem {
+                    text: qsTr("Rename Folder")
+                    visible: isDirContextMenu
+                    height: visible ? implicitHeight : 0
+                    onTriggered: renameFolderDialog.open()
+                }
+
                 StudioControls.MenuItem {
                     text: qsTr("New Folder")
                     onTriggered: newFolderDialog.open()
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/Switch.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/Switch.qml
new file mode 100644
index 00000000000..5ff41c404d5
--- /dev/null
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/Switch.qml
@@ -0,0 +1,225 @@
+/****************************************************************************
+**
+** Copyright (C) 2022 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+****************************************************************************/
+
+import QtQuick 2.15
+import QtQuick.Templates 2.15 as T
+import StudioTheme 1.0 as StudioTheme
+
+T.Switch {
+    id: root
+
+    property alias actionIndicator: actionIndicator
+
+    // This property is used to indicate the global hover state
+    property bool hover: root.hovered && root.enabled
+    property bool edit: false
+
+    property alias actionIndicatorVisible: actionIndicator.visible
+    property real __actionIndicatorWidth: StudioTheme.Values.actionIndicatorWidth
+    property real __actionIndicatorHeight: StudioTheme.Values.actionIndicatorHeight
+
+    property alias labelVisible: switchLabel.visible
+    property alias labelColor: switchLabel.color
+
+    property alias fontFamily: switchLabel.font.family
+    property alias fontPixelSize: switchLabel.font.pixelSize
+
+    font.pixelSize: StudioTheme.Values.myFontSize
+
+    implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
+                            implicitContentWidth + leftPadding + rightPadding)
+    implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
+                             implicitContentHeight + topPadding + bottomPadding,
+                             implicitIndicatorHeight + topPadding + bottomPadding)
+
+    spacing: StudioTheme.Values.switchSpacing
+    hoverEnabled: true
+    activeFocusOnTab: false
+
+    ActionIndicator {
+        id: actionIndicator
+        myControl: root
+        width: actionIndicator.visible ? root.__actionIndicatorWidth : 0
+        height: actionIndicator.visible ? root.__actionIndicatorHeight : 0
+    }
+
+    indicator: Rectangle {
+        id: switchBackground
+        x: actionIndicator.width
+        y: 0
+        z: 5
+        implicitWidth: StudioTheme.Values.height * 2
+        implicitHeight: StudioTheme.Values.height
+        radius: StudioTheme.Values.height * 0.5
+        color: StudioTheme.Values.themeControlBackground
+        border.width: StudioTheme.Values.border
+        border.color: StudioTheme.Values.themeControlOutline
+
+        Rectangle {
+            id: switchIndicator
+
+            readonly property real gap: 5
+            property real size: switchBackground.implicitHeight - switchIndicator.gap * 2
+
+            x: root.checked ? parent.width - width - switchIndicator.gap
+                            : switchIndicator.gap
+            y: switchIndicator.gap
+            width: switchIndicator.size
+            height: switchIndicator.size
+            radius: switchIndicator.size * 0.5
+            color: StudioTheme.Values.themeTextColor
+            border.width: 0
+        }
+    }
+
+    contentItem: T.Label {
+        id: switchLabel
+        leftPadding: switchBackground.x + switchBackground.width + root.spacing
+        rightPadding: 0
+        verticalAlignment: Text.AlignVCenter
+        text: root.text
+        font: root.font
+        color: StudioTheme.Values.themeTextColor
+        visible: text !== ""
+    }
+
+    property bool __default: root.enabled && !root.hover && !actionIndicator.hover && !root.pressed
+    property bool __globalHover: root.enabled && actionIndicator.hover && !root.pressed
+    property bool __hover: root.hover && !actionIndicator.hover && !root.pressed
+    property bool __press: root.hover && root.pressed
+
+    states: [
+        State {
+            name: "default"
+            when: root.__default && !root.checked
+            PropertyChanges {
+                target: switchBackground
+                color: StudioTheme.Values.themeControlBackground
+                border.color: StudioTheme.Values.themeControlOutline
+            }
+            PropertyChanges {
+                target: switchIndicator
+                color: StudioTheme.Values.themeTextColor
+            }
+        },
+        State {
+            name: "globalHover"
+            when: root.__globalHover && !root.checked
+            PropertyChanges {
+                target: switchBackground
+                color: StudioTheme.Values.themeControlBackgroundGlobalHover
+                border.color: StudioTheme.Values.themeControlOutline
+            }
+            PropertyChanges {
+                target: switchIndicator
+                color: StudioTheme.Values.themeTextColor
+            }
+        },
+        State {
+            name: "hover"
+            when: root.__hover && !root.checked
+            PropertyChanges {
+                target: switchBackground
+                color: StudioTheme.Values.themeControlBackgroundHover
+                border.color: StudioTheme.Values.themeControlOutline
+            }
+            PropertyChanges {
+                target: switchIndicator
+                color: StudioTheme.Values.themeTextColor
+            }
+        },
+        State {
+            name: "press"
+            when: root.__press && !root.checked
+            PropertyChanges {
+                target: switchBackground
+                color: StudioTheme.Values.themeControlBackgroundInteraction
+                border.color: StudioTheme.Values.themeControlOutlineInteraction
+            }
+            PropertyChanges {
+                target: switchIndicator
+                color: StudioTheme.Values.themeInteraction
+            }
+        },
+        State {
+            name: "disable"
+            when: !root.enabled && !root.checked
+            PropertyChanges {
+                target: switchBackground
+                color: StudioTheme.Values.themeControlBackgroundDisabled
+                border.color: StudioTheme.Values.themeControlOutlineDisabled
+            }
+            PropertyChanges {
+                target: switchIndicator
+                color: StudioTheme.Values.themeTextColorDisabled
+            }
+            PropertyChanges {
+                target: switchLabel
+                color: StudioTheme.Values.themeTextColorDisabled
+            }
+        },
+
+        State {
+            name: "defaultChecked"
+            when: root.__default && root.checked
+            extend: "default"
+            PropertyChanges {
+                target: switchBackground
+                color: StudioTheme.Values.themeInteraction
+                border.color: StudioTheme.Values.themeInteraction
+            }
+        },
+        State {
+            name: "globalHoverChecked"
+            when: root.__globalHover && root.checked
+            extend: "globalHover"
+            PropertyChanges {
+                target: switchBackground
+                color: StudioTheme.Values.themeInteractionHover
+                border.color: StudioTheme.Values.themeInteractionHover
+            }
+        },
+        State {
+            name: "hoverChecked"
+            when: root.__hover && root.checked
+            extend: "hover"
+            PropertyChanges {
+                target: switchBackground
+                color: StudioTheme.Values.themeInteractionHover
+                border.color: StudioTheme.Values.themeInteractionHover
+            }
+        },
+        State {
+            name: "pressChecked"
+            when: root.__press && root.checked
+            extend: "press"
+        },
+        State {
+            name: "disableChecked"
+            when: !root.enabled && root.checked
+            extend: "disable"
+        }
+    ]
+}
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml
index bba4b2001f8..02842e810a0 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml
@@ -72,6 +72,8 @@ QtObject {
     property real radioButtonIndicatorWidth: 14
     property real radioButtonIndicatorHeight: 14
 
+    property real switchSpacing: values.checkBoxSpacing
+
     property real columnWidth: 225 + (175 * (values.scaleFactor * 2))
 
     property real marginTopBottom: 4
@@ -214,6 +216,8 @@ QtObject {
     property string themeWarning: Theme.color(Theme.DSwarningColor)
     property string themeDisabled: Theme.color(Theme.DSdisabledColor)
 
+    property string themeInteractionHover: Theme.color(Theme.DSinteractionHover)
+
     property string themeAliasIconChecked: Theme.color(Theme.DSnavigatorAliasIconChecked)
 
     // Control colors
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json
index cc5d8246293..dbbf7331195 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json
@@ -65,7 +65,7 @@
                                 })"
                             },
                             {
-                                "trKey": "2560 x 1440 (QHD)",
+                                "trKey": "2560 x 1440",
                                 "value":
                                 "({
                                     'ScreenWidth': '2560',
@@ -73,7 +73,7 @@
                                 })"
                             },
                             {
-                                "trKey": "1920 x 1080 (FullHD)",
+                                "trKey": "1920 x 1080",
                                 "value":
                                 "({
                                     'ScreenWidth': '1920',
@@ -97,7 +97,7 @@
                                 })"
                             },
                             {
-                                "trKey": "1280 x 720 (HD)",
+                                "trKey": "1280 x 720",
                                 "value":
                                 "({
                                     'ScreenWidth': '1280',
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/wizard.json
index 1ba63959053..a6288939eac 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/wizard.json
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/wizard.json
@@ -70,7 +70,7 @@
                                 })"
                             },
                             {
-                                "trKey": "720 x 1280 (HD)",
+                                "trKey": "720 x 1280",
                                 "value":
                                 "({
                                     'ScreenWidth': '720',
@@ -78,7 +78,7 @@
                                 })"
                             },
                             {
-                                "trKey": "1280 x 720 (HD)",
+                                "trKey": "1280 x 720",
                                 "value":
                                 "({
                                     'ScreenWidth': '1280',
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/application/wizard.json
index 54d495f9fbc..db5c4128bed 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/application/wizard.json
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/application/wizard.json
@@ -67,7 +67,7 @@
                                 })"
                             },
                             {
-                                "trKey": "2560 x 1440 (QHD)",
+                                "trKey": "2560 x 1440",
                                 "value":
                                 "({
                                     'ScreenWidth': '2560',
@@ -75,7 +75,7 @@
                                 })"
                             },
                             {
-                                "trKey": "1920 x 1080 (FullHD)",
+                                "trKey": "1920 x 1080",
                                 "value":
                                 "({
                                     'ScreenWidth': '1920',
@@ -99,7 +99,7 @@
                                 })"
                             },
                             {
-                                "trKey": "1280 x 720 (HD)",
+                                "trKey": "1280 x 720",
                                 "value":
                                 "({
                                     'ScreenWidth': '1280',
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/common/app.qmlproject.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/common/app.qmlproject.tpl
index fcea02a93b5..f24482bcac8 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/common/app.qmlproject.tpl
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/common/app.qmlproject.tpl
@@ -9,15 +9,23 @@ Project {
 
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
-        directory: "."
+        directory: "content"
+    }
+
+    QmlFiles {
+        directory: "imports"
     }
 
     JavaScriptFiles {
-        directory: "."
+        directory: "content"
+    }
+
+     JavaScriptFiles {
+        directory: "imports"
     }
 
     ImageFiles {
-        directory: "."
+        directory: "content"
     }
 
     Files {
@@ -34,6 +42,18 @@ Project {
         filter: "*.ttf;*.otf"
     }
 
+    Files {
+        filter: "*.wav;*.mp3"
+    }
+
+    Files {
+        filter: "*.mp4"
+    }
+
+    Files {
+        filter: "*.glsl;*.glslv;*.glslf;*.vsh;*.fsh;*.vert;*.frag"
+    }
+
     Files {
         filter: "*.mesh"
         directory: "asset_imports"
@@ -61,13 +81,20 @@ Project {
 @endif
 
     /* List of plugin directories passed to QML runtime */
-    importPaths: [ ".", "imports", "asset_imports" ]
+    importPaths: [ "imports", "asset_imports" ]
 
     /* Required for deployment */
     targetDirectory: "/opt/%{ProjectName}"
 
+    qdsVersion: "3.0"
+
 @if %{IsQt6Project}
     /* If any modules the project imports require widgets (e.g. QtCharts), widgetApp must be true */
     widgetApp: true
 @endif
+
+    multilanguageSupport: true
+    supportedLanguages: ["en"]
+    primaryLanguage: "en"
+
 }
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/desktop-launcher/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/desktop-launcher/wizard.json
index bd055220e13..5b157ec2c57 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/desktop-launcher/wizard.json
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/desktop-launcher/wizard.json
@@ -55,7 +55,7 @@
                         "items":
                             [
                             {
-                                "trKey": "2960 x 1440 (QHD)",
+                                "trKey": "2960 x 1440",
                                 "value":
                                 "({
                                     'ScreenWidth': '2960',
@@ -71,7 +71,7 @@
                                 })"
                             },
                             {
-                                "trKey": "1920 x 1080 (FullHD)",
+                                "trKey": "1920 x 1080",
                                 "value":
                                 "({
                                     'ScreenWidth': '1920',
@@ -95,7 +95,7 @@
                                 })"
                             },
                             {
-                                "trKey": "1280 x 720 (HD)",
+                                "trKey": "1280 x 720",
                                 "value":
                                 "({
                                     'ScreenWidth': '1280',
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-scroll/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-scroll/wizard.json
index 1673f857ad6..318dbdac5e1 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-scroll/wizard.json
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-scroll/wizard.json
@@ -55,7 +55,7 @@
                         "items":
                             [
                             {
-                                "trKey": "1080 x 1920 (FullHD)",
+                                "trKey": "1080 x 1920",
                                 "value":
                                 "({
                                     'ScreenWidth': '1080',
@@ -79,7 +79,7 @@
                                 })"
                             },
                             {
-                                "trKey": "720 x 1280 (HD)",
+                                "trKey": "720 x 1280",
                                 "value":
                                 "({
                                     'ScreenWidth': '720',
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-stack/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-stack/wizard.json
index 8bba34e22d9..986c8cbdb8c 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-stack/wizard.json
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-stack/wizard.json
@@ -53,7 +53,7 @@
                         "items":
                             [
                             {
-                                "trKey": "1080 x 1920 (FullHD)",
+                                "trKey": "1080 x 1920",
                                 "value":
                                 "({
                                      'ScreenWidth': '1080',
@@ -77,7 +77,7 @@
                                 })"
                             },
                             {
-                                "trKey": "720 x 1280 (HD)",
+                                "trKey": "720 x 1280",
                                 "value":
                                 "({
                                     'ScreenWidth': '720',
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-swipe/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-swipe/wizard.json
index 5a7faa7364d..3773a615f50 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-swipe/wizard.json
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-swipe/wizard.json
@@ -53,7 +53,7 @@
                         "items":
                             [
                             {
-                                "trKey": "1080 x 1920 (FullHD)",
+                                "trKey": "1080 x 1920",
                                 "value":
                                 "({
                                     'ScreenWidth': '1080',
@@ -77,7 +77,7 @@
                                 })"
                             },
                             {
-                                "trKey": "720 x 1280 (HD)",
+                                "trKey": "720 x 1280",
                                 "value":
                                 "({
                                     'ScreenWidth': '720',
diff --git a/share/qtcreator/templates/wizards/projects/consoleapp/file.qbs b/share/qtcreator/templates/wizards/projects/consoleapp/file.qbs
index 35ce99c77ac..6406f0cb013 100644
--- a/share/qtcreator/templates/wizards/projects/consoleapp/file.qbs
+++ b/share/qtcreator/templates/wizards/projects/consoleapp/file.qbs
@@ -1,8 +1,6 @@
 import qbs
 
 QtApplication {
-    cpp.cxxLanguageVersion: "c++11"
-
     cpp.defines: [
         // You can make your code fail to compile if it uses deprecated APIs.
         // In order to do so, uncomment the following line.
@@ -10,6 +8,7 @@ QtApplication {
     ]
 
     consoleApplication: true
+    install: true
     files: [
         "%{CppFileName}",
 @if %{HasTranslation}
@@ -24,10 +23,4 @@ QtApplication {
         fileTags: "qt.core.resource_data"
     }
 @endif
-
-    Group {     // Properties for the produced executable
-        fileTagsFilter: "application"
-        qbs.install: true
-        qbs.installDir: "bin"
-    }
 }
diff --git a/share/qtcreator/templates/wizards/projects/plainc/file.qbs b/share/qtcreator/templates/wizards/projects/plainc/file.qbs
index a2bd3fb9439..0e9eb0288db 100644
--- a/share/qtcreator/templates/wizards/projects/plainc/file.qbs
+++ b/share/qtcreator/templates/wizards/projects/plainc/file.qbs
@@ -2,11 +2,6 @@ import qbs
 
 CppApplication {
     consoleApplication: true
+    install: true
     files: "%{CFileName}"
-
-    Group {     // Properties for the produced executable
-        fileTagsFilter: "application"
-        qbs.install: true
-        qbs.installDir: "bin"
-    }
 }
diff --git a/share/qtcreator/templates/wizards/projects/plaincpp/file.qbs b/share/qtcreator/templates/wizards/projects/plaincpp/file.qbs
index b07ba3fd424..6ce956cc6ee 100644
--- a/share/qtcreator/templates/wizards/projects/plaincpp/file.qbs
+++ b/share/qtcreator/templates/wizards/projects/plaincpp/file.qbs
@@ -2,11 +2,6 @@ import qbs
 
 CppApplication {
     consoleApplication: true
+    install: true
     files: "%{CppFileName}"
-
-    Group {     // Properties for the produced executable
-        fileTagsFilter: "application"
-        qbs.install: true
-        qbs.installDir: "bin"
-    }
 }
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/app.qbs b/share/qtcreator/templates/wizards/projects/qtquickapplication/app.qbs
index 31320cad6a9..14025b37b82 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/app.qbs
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/app.qbs
@@ -7,6 +7,8 @@ CppApplication {
     Depends { name: "Qt.quick" }
 @endif
 
+    install: true
+
     // Additional import path used to resolve QML modules in Qt Creator's code model
     property pathList qmlImportPaths: []
 @if !%{IsQt6}
@@ -43,9 +45,4 @@ CppApplication {
         fileTags: ["qt.qml.qml", "qt.core.resource_data"]
     }
 @endif
-    Group {     // Properties for the produced executable
-        fileTagsFilter: "application"
-        qbs.install: true
-        qbs.installDir: "bin"
-    }
 }
diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme
index 12c8019b0da..476de0f3e4b 100644
--- a/share/qtcreator/themes/dark.creatortheme
+++ b/share/qtcreator/themes/dark.creatortheme
@@ -35,6 +35,8 @@ DSerrorColor=ffdf3a3a
 DSwarningColor=warning
 DSdisabledColor=ff707070
 
+DSinteractionHover=ff74cbfc
+
 DScontrolBackground=ff2e2f30
 DScontrolBackgroundInteraction=ff3d3d3d
 DScontrolBackgroundDisabled=ff2e2f30
@@ -263,7 +265,6 @@ ProgressBarBackgroundColor=normalBackground
 SplitterColor=splitterColor
 TextColorDisabled=textDisabled
 TextColorError=ffff4040
-TextColorHighlight=ffff0000
 TextColorHighlightBackground=7a6f1c
 TextColorLink=textColorLink
 TextColorLinkVisited=textColorLinkVisited
diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme
index 6cf1402c1e6..f9962a8bebd 100644
--- a/share/qtcreator/themes/default.creatortheme
+++ b/share/qtcreator/themes/default.creatortheme
@@ -26,6 +26,8 @@ DSerrorColor=ffdf3a3a
 DSwarningColor=warning
 DSdisabledColor=ff8e8e8e
 
+DSinteractionHover=ff74cbfc
+
 DScontrolBackground=ffeaeaea
 DScontrolBackgroundInteraction=ffc9c9c9
 DScontrolBackgroundDisabled=ffeaeaea
@@ -254,7 +256,6 @@ ProgressBarBackgroundColor=18ffffff
 SplitterColor=splitterColor
 TextColorDisabled=55000000
 TextColorError=ffff0000
-TextColorHighlight=ffa0a0a4
 TextColorHighlightBackground=ffef0b
 TextColorLink=ff0057ae
 TextColorLinkVisited=ff644a9b
diff --git a/share/qtcreator/themes/design-light.creatortheme b/share/qtcreator/themes/design-light.creatortheme
index 8a826ad1810..d9220d1394d 100644
--- a/share/qtcreator/themes/design-light.creatortheme
+++ b/share/qtcreator/themes/design-light.creatortheme
@@ -40,6 +40,8 @@ DSerrorColor=ffdf3a3a
 DSwarningColor=warning
 DSdisabledColor=ff8e8e8e
 
+DSinteractionHover=ff74cbfc
+
 DScontrolBackground=ffeaeaea
 DScontrolBackgroundInteraction=ffc9c9c9
 DScontrolBackgroundDisabled=ffeaeaea
@@ -268,7 +270,6 @@ ProgressBarBackgroundColor=28000000
 SplitterColor=splitter
 TextColorDisabled=textDisabled
 TextColorError=ffff4040
-TextColorHighlight=ffff0000
 TextColorHighlightBackground=ffef0b
 TextColorLink=ff007af4
 TextColorLinkVisited=ffa57aff
diff --git a/share/qtcreator/themes/design.creatortheme b/share/qtcreator/themes/design.creatortheme
index 628938b5f72..d0d3b94c2d3 100644
--- a/share/qtcreator/themes/design.creatortheme
+++ b/share/qtcreator/themes/design.creatortheme
@@ -37,6 +37,8 @@ DSerrorColor=ffdf3a3a
 DSwarningColor=warning
 DSdisabledColor=ff707070
 
+DSinteractionHover=ff74cbfc
+
 DScontrolBackground=ff2e2f30
 DScontrolBackgroundInteraction=ff3d3d3d
 DScontrolBackgroundDisabled=ff2e2f30
@@ -265,7 +267,6 @@ ProgressBarBackgroundColor=a0606060
 SplitterColor=splitter
 TextColorDisabled=textDisabled
 TextColorError=ffff4040
-TextColorHighlight=ffff0000
 TextColorHighlightBackground=8a7f2c
 TextColorLink=textColorLink
 TextColorLinkVisited=textColorLinkVisited
diff --git a/share/qtcreator/themes/flat-dark.creatortheme b/share/qtcreator/themes/flat-dark.creatortheme
index 981c4819454..de82d3cb39f 100644
--- a/share/qtcreator/themes/flat-dark.creatortheme
+++ b/share/qtcreator/themes/flat-dark.creatortheme
@@ -39,6 +39,8 @@ DSerrorColor=ffdf3a3a
 DSwarningColor=warning
 DSdisabledColor=ff707070
 
+DSinteractionHover=ff74cbfc
+
 DScontrolBackground=ff2e2f30
 DScontrolBackgroundInteraction=ff3d3d3d
 DScontrolBackgroundDisabled=ff2e2f30
@@ -267,7 +269,6 @@ ProgressBarBackgroundColor=a0606060
 SplitterColor=splitter
 TextColorDisabled=textDisabled
 TextColorError=ffff4040
-TextColorHighlight=ffff0000
 TextColorHighlightBackground=7a6f1c
 TextColorLink=textColorLink
 TextColorLinkVisited=textColorLinkVisited
diff --git a/share/qtcreator/themes/flat-light.creatortheme b/share/qtcreator/themes/flat-light.creatortheme
index 5690e4db91a..1332f36b0d8 100644
--- a/share/qtcreator/themes/flat-light.creatortheme
+++ b/share/qtcreator/themes/flat-light.creatortheme
@@ -35,6 +35,8 @@ DSerrorColor=ffdf3a3a
 DSwarningColor=warning
 DSdisabledColor=ff8e8e8e
 
+DSinteractionHover=ff74cbfc
+
 DScontrolBackground=ffeaeaea
 DScontrolBackgroundInteraction=ffc9c9c9
 DScontrolBackgroundDisabled=ffeaeaea
@@ -263,7 +265,6 @@ ProgressBarBackgroundColor=28000000
 SplitterColor=splitter
 TextColorDisabled=textDisabled
 TextColorError=ffff4040
-TextColorHighlight=ffff0000
 TextColorHighlightBackground=ffef0b
 TextColorLink=ff007af4
 TextColorLinkVisited=ffa57aff
diff --git a/share/qtcreator/themes/flat.creatortheme b/share/qtcreator/themes/flat.creatortheme
index beac6c91c8d..c6b5ae81abb 100644
--- a/share/qtcreator/themes/flat.creatortheme
+++ b/share/qtcreator/themes/flat.creatortheme
@@ -33,6 +33,8 @@ DSerrorColor=ffdf3a3a
 DSwarningColor=warning
 DSdisabledColor=ff707070
 
+DSinteractionHover=ff74cbfc
+
 DScontrolBackground=ff2e2f30
 DScontrolBackgroundInteraction=ff3d3d3d
 DScontrolBackgroundDisabled=ff2e2f30
@@ -261,7 +263,6 @@ ProgressBarBackgroundColor=a0606060
 SplitterColor=splitter
 TextColorDisabled=textDisabled
 TextColorError=ffff4040
-TextColorHighlight=ffff0000
 TextColorHighlightBackground=ffef0b
 TextColorLink=ff007af4
 TextColorLinkVisited=ffa57aff
diff --git a/src/libs/qtcreatorcdbext/CMakeLists.txt b/src/libs/qtcreatorcdbext/CMakeLists.txt
index 3797afd1cf2..03ca0eda6d8 100644
--- a/src/libs/qtcreatorcdbext/CMakeLists.txt
+++ b/src/libs/qtcreatorcdbext/CMakeLists.txt
@@ -25,18 +25,6 @@ if (CMAKE_SIZEOF_VOID_P EQUAL 8)
   set(ArchSuffix 64)
 endif()
 
-# statically link MSVC runtime
-# see https://gitlab.kitware.com/cmake/community/-/wikis/FAQ#how-can-i-build-my-msvc-application-with-a-static-runtime
-# TODO change to MSVC_RUNTIME_LIBRARY when CMake 3.15 is required
-# set_property(TARGET qtcreatorcdbext PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-foreach(flag_var
-    CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
-    CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
-  if(${flag_var} MATCHES "/MD")
-    string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
-  endif()
-endforeach()
-
 add_qtc_library(qtcreatorcdbext
   COMPONENT qtcreatorcdbext
   DEPENDS ${DbgEngLib}
@@ -60,6 +48,9 @@ add_qtc_library(qtcreatorcdbext
 
 qtc_library_enabled(_library_enabled qtcreatorcdbext)
 if (_library_enabled)
+  # statically link MSVC runtime
+  set_property(TARGET qtcreatorcdbext PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+
   find_package(Python3 3.8 COMPONENTS Development)
 
   if (NOT ${Python3_Development_FOUND})
diff --git a/src/libs/ssh/sshconnection.h b/src/libs/ssh/sshconnection.h
index 3447f3c195c..381bd463c91 100644
--- a/src/libs/ssh/sshconnection.h
+++ b/src/libs/ssh/sshconnection.h
@@ -61,6 +61,7 @@ public:
     QString host() const { return url.host(); }
     quint16 port() const { return url.port(); }
     QString userName() const { return url.userName(); }
+    QString userAtHost() const { return userName().isEmpty() ? host() : userName() + '@' + host(); }
     void setHost(const QString &host) { url.setHost(host); }
     void setPort(int port) { url.setPort(port); }
     void setUserName(const QString &name) { url.setUserName(name); }
diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp
index 8470d0de10f..a4d632b7e4d 100644
--- a/src/libs/utils/aspects.cpp
+++ b/src/libs/utils/aspects.cpp
@@ -215,7 +215,11 @@ void BaseAspect::setupLabel()
     if (d->m_labelText.isEmpty() && d->m_labelPixmap.isNull())
         return;
     d->m_label = new QLabel(d->m_labelText);
-    d->m_label->setTextInteractionFlags(Qt::TextSelectableByMouse);
+    d->m_label->setTextInteractionFlags(d->m_label->textInteractionFlags()
+                                        | Qt::TextSelectableByMouse);
+    connect(d->m_label, &QLabel::linkActivated, this, [this](const QString &link) {
+        emit labelLinkActivated(link);
+    });
     if (!d->m_labelPixmap.isNull())
         d->m_label->setPixmap(d->m_labelPixmap);
     registerSubWidget(d->m_label);
diff --git a/src/libs/utils/aspects.h b/src/libs/utils/aspects.h
index 0771dc65bf1..d1a0bdfe553 100644
--- a/src/libs/utils/aspects.h
+++ b/src/libs/utils/aspects.h
@@ -142,6 +142,7 @@ public:
 
 signals:
     void changed();
+    void labelLinkActivated(const QString &link);
 
 protected:
     QLabel *label() const;
diff --git a/src/libs/utils/mimetypes/mimedatabase.cpp b/src/libs/utils/mimetypes/mimedatabase.cpp
index 656797c44fd..35e0257e5e7 100644
--- a/src/libs/utils/mimetypes/mimedatabase.cpp
+++ b/src/libs/utils/mimetypes/mimedatabase.cpp
@@ -738,6 +738,8 @@ MimeType Utils::mimeTypeForFile(const QFileInfo &fileInfo, MimeMatchMode mode)
 MimeType Utils::mimeTypeForFile(const FilePath &filePath, MimeMatchMode mode)
 {
     MimeDatabase mdb;
+    if (filePath.needsDevice())
+        return mdb.mimeTypeForUrl(filePath.toUrl());
     return mdb.mimeTypeForFile(filePath.toString(), MimeDatabase::MatchMode(mode));
 }
 
diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp
index 04561a5af8b..9e56fe0f1be 100644
--- a/src/libs/utils/qtcprocess.cpp
+++ b/src/libs/utils/qtcprocess.cpp
@@ -263,9 +263,6 @@ public:
     void setAbortOnMetaChars(bool abort) { m_abortOnMetaChars = abort; }
     bool isAbortOnMetaChars() const { return m_abortOnMetaChars; }
 
-    void setRunAsRoot(bool on) { m_runAsRoot = on; }
-    bool runAsRoot() const { return m_runAsRoot; }
-
     void setBelowNormalPriority() { m_belowNormalPriority = true; }
     bool isBelowNormalPriority() const { return m_belowNormalPriority; }
     void setNativeArguments(const QString &arguments) { m_nativeArguments = arguments; }
@@ -287,7 +284,6 @@ private:
     bool m_lowPriority = false;
     bool m_unixTerminalDisabled = false;
     bool m_abortOnMetaChars = true;
-    bool m_runAsRoot = false;
 };
 
 class TerminalImpl : public ProcessInterface
@@ -319,7 +315,6 @@ public:
     void customStart(const CommandLine &command, const FilePath &workingDirectory,
                      const Environment &environment) override
     {
-        m_terminal.setRunAsRoot(runAsRoot());
         m_terminal.setAbortOnMetaChars(isAbortOnMetaChars());
         m_terminal.setCommand(command);
         m_terminal.setWorkingDirectory(workingDirectory);
@@ -568,6 +563,7 @@ public:
         , q(parent)
         , m_process(newProcessInstance(parent, processImpl, processMode, terminalMode))
         , m_processMode(processMode)
+        , m_terminalMode(terminalMode)
     {
         connect(m_process, &ProcessInterface::started,
                 q, &QtcProcess::started);
@@ -606,45 +602,29 @@ public:
         return filePath.searchInPath();
     }
 
-    void defaultStart()
+    void defaultStart(const CommandLine &commandLine, const FilePath &workingDirectory,
+                      const Environment &environment)
     {
-        clearForRun();
-
-        if (m_commandLine.executable().needsDevice()) {
-            QTC_ASSERT(s_deviceHooks.startProcessHook, return);
-            s_deviceHooks.startProcessHook(*q);
-            return;
-        }
-
         if (processLog().isDebugEnabled()) {
             static int n = 0;
-            qCDebug(processLog) << "STARTING PROCESS: " << ++n << "  " << m_commandLine.toUserOutput();
+            qCDebug(processLog) << "STARTING PROCESS: " << ++n << "  " << commandLine.toUserOutput();
         }
 
-        Environment env;
-        if (m_haveEnv) {
-            if (m_environment.size() == 0)
-                qWarning("QtcProcess::start: Empty environment set when running '%s'.",
-                         qPrintable(m_commandLine.executable().toString()));
-            env = m_environment;
-        } else {
-            env = Environment::systemEnvironment();
-        }
-        m_process->setProcessEnvironment(env.toProcessEnvironment());
-        m_process->setWorkingDirectory(m_workingDirectory.path());
+        m_process->setProcessEnvironment(environment.toProcessEnvironment());
+        m_process->setWorkingDirectory(workingDirectory.path());
 
-        QString command;
+        QString commandString;
         ProcessArgs arguments;
-        const bool success = ProcessArgs::prepareCommand(m_commandLine, &command, &arguments, &env,
-                                                         &m_workingDirectory);
+        const bool success = ProcessArgs::prepareCommand(commandLine, &commandString, &arguments,
+                                                         &environment, &workingDirectory);
 
-        if (m_commandLine.executable().osType() == OsTypeWindows) {
+        if (commandLine.executable().osType() == OsTypeWindows) {
             QString args;
             if (m_useCtrlCStub) {
                 if (m_process->isLowPriority())
                     ProcessArgs::addArg(&args, "-nice");
-                ProcessArgs::addArg(&args, QDir::toNativeSeparators(command));
-                command = QCoreApplication::applicationDirPath()
+                ProcessArgs::addArg(&args, QDir::toNativeSeparators(commandString));
+                commandString = QCoreApplication::applicationDirPath()
                         + QLatin1String("/qtcreator_ctrlc_stub.exe");
             } else if (m_process->isLowPriority()) {
                 m_process->setBelowNormalPriority();
@@ -655,7 +635,7 @@ public:
 #endif
             // Note: Arguments set with setNativeArgs will be appended to the ones
             // passed with start() below.
-            start(command, QStringList(), m_writeData);
+            start(commandString, QStringList(), workingDirectory, m_writeData);
         } else {
             if (!success) {
                 q->setErrorString(tr("Error in command line."));
@@ -664,13 +644,14 @@ public:
                 emit q->errorOccurred(QProcess::UnknownError);
                 return;
             }
-            start(command, arguments.toUnixArgs(), m_writeData);
+            start(commandString, arguments.toUnixArgs(), workingDirectory, m_writeData);
         }
     }
 
-    void start(const QString &program, const QStringList &arguments, const QByteArray &writeData)
+    void start(const QString &program, const QStringList &arguments,
+               const FilePath &workingDirectory, const QByteArray &writeData)
     {
-        const FilePath programFilePath = resolve(m_workingDirectory, FilePath::fromString(program));
+        const FilePath programFilePath = resolve(workingDirectory, FilePath::fromString(program));
         if (programFilePath.exists() && programFilePath.isExecutableFile()) {
             s_start.measureAndRun(&ProcessInterface::start, m_process, program, arguments, writeData);
         } else {
@@ -680,13 +661,42 @@ public:
         }
     }
 
+    CommandLine fullCommandLine() const
+    {
+        if (!m_runAsRoot || HostOsInfo::isWindowsHost())
+            return m_commandLine;
+        CommandLine rootCommand("sudo", {"-A"});
+        rootCommand.addCommandLineAsArgs(m_commandLine);
+        return rootCommand;
+    }
+
+    Environment fullEnvironment() const
+    {
+        Environment env;
+        if (m_haveEnv) {
+            if (m_environment.size() == 0)
+                qWarning("QtcProcess::start: Empty environment set when running '%s'.",
+                         qPrintable(m_commandLine.executable().toString()));
+            env = m_environment;
+        } else {
+            env = Environment::systemEnvironment();
+        }
+
+// TODO: needs SshSettings
+//        if (m_runAsRoot)
+//            RunControl::provideAskPassEntry(env);
+        return env;
+    }
+
     QtcProcess *q;
     ProcessInterface *m_process;
     const ProcessMode m_processMode;
+    const QtcProcess::TerminalMode m_terminalMode;
     CommandLine m_commandLine;
     FilePath m_workingDirectory;
     Environment m_environment;
     QByteArray m_writeData;
+    bool m_runAsRoot = false;
     bool m_haveEnv = false;
     bool m_useCtrlCStub = false;
 
@@ -774,6 +784,11 @@ ProcessMode QtcProcess::processMode() const
     return d->m_processMode;
 }
 
+QtcProcess::TerminalMode QtcProcess::terminalMode() const
+{
+    return d->m_terminalMode;
+}
+
 void QtcProcess::setEnvironment(const Environment &env)
 {
     d->m_environment = env;
@@ -791,12 +806,17 @@ const Environment &QtcProcess::environment() const
     return d->m_environment;
 }
 
+bool QtcProcess::hasEnvironment() const
+{
+    return d->m_haveEnv;
+}
+
 void QtcProcess::setCommand(const CommandLine &cmdLine)
 {
     if (d->m_workingDirectory.needsDevice() && cmdLine.executable().needsDevice()) {
         QTC_CHECK(d->m_workingDirectory.host() == cmdLine.executable().host());
     }
-    d->m_commandLine  = cmdLine;
+    d->m_commandLine = cmdLine;
 }
 
 const CommandLine &QtcProcess::commandLine() const
@@ -831,10 +851,18 @@ void QtcProcess::setUseCtrlCStub(bool enabled)
 
 void QtcProcess::start()
 {
+    if (d->m_commandLine.executable().needsDevice()) {
+        QTC_ASSERT(s_deviceHooks.startProcessHook, return);
+        s_deviceHooks.startProcessHook(*this);
+        return;
+    }
+    d->clearForRun();
+    const CommandLine cmd = d->fullCommandLine();
+    const Environment env = d->fullEnvironment();
     if (d->m_process->isCustomStart())
-        d->m_process->customStart(d->m_commandLine, d->m_workingDirectory, d->m_environment);
+        d->m_process->customStart(cmd, d->m_workingDirectory, env);
     else
-        d->defaultStart();
+        d->defaultStart(cmd, d->m_workingDirectory, env);
 }
 
 #ifdef Q_OS_WIN
@@ -905,7 +933,12 @@ void QtcProcess::setAbortOnMetaChars(bool abort)
 
 void QtcProcess::setRunAsRoot(bool on)
 {
-    d->m_process->setRunAsRoot(on);
+    d->m_runAsRoot = on;
+}
+
+bool QtcProcess::isRunAsRoot() const
+{
+    return d->m_runAsRoot;
 }
 
 void QtcProcess::setStandardInputFile(const QString &inputFile)
diff --git a/src/libs/utils/qtcprocess.h b/src/libs/utils/qtcprocess.h
index eb2bff71331..fa844d18955 100644
--- a/src/libs/utils/qtcprocess.h
+++ b/src/libs/utils/qtcprocess.h
@@ -90,6 +90,7 @@ public:
     ~QtcProcess();
 
     ProcessMode processMode() const;
+    TerminalMode terminalMode() const;
 
     enum Result {
         // Finished successfully. Unless an ExitCodeInterpreter is set
@@ -111,6 +112,7 @@ public:
     void setEnvironment(const Environment &env);
     void unsetEnvironment();
     const Environment &environment() const;
+    bool hasEnvironment() const;
 
     void setCommand(const CommandLine &cmdLine);
     const CommandLine &commandLine() const;
@@ -122,6 +124,7 @@ public:
     void setLowPriority();
     void setDisableUnixTerminal();
     void setRunAsRoot(bool on);
+    bool isRunAsRoot() const;
 
     void setAbortOnMetaChars(bool abort);
 
diff --git a/src/libs/utils/terminalprocess.cpp b/src/libs/utils/terminalprocess.cpp
index a12107e1715..f24b6aaf952 100644
--- a/src/libs/utils/terminalprocess.cpp
+++ b/src/libs/utils/terminalprocess.cpp
@@ -142,7 +142,6 @@ public:
     QProcess::ProcessError m_error = QProcess::UnknownError;
     QString m_errorString;
     bool m_abortOnMetaChars = true;
-    bool m_runAsRoot = false;
 
     // Used on Unix only
     QtcProcess m_process;
@@ -431,8 +430,6 @@ void TerminalProcess::start()
             + QLatin1String("/" RELATIVE_LIBEXEC_PATH "/qtcreator_process_stub");
 
     QStringList allArgs = terminalArgs.toUnixArgs();
-    if (d->m_runAsRoot)
-        allArgs << "sudo" << "-A";
 
     allArgs << stubPath
             << modeOption(d->m_terminalMode)
@@ -797,11 +794,6 @@ const Environment &TerminalProcess::environment() const
     return d->m_environment;
 }
 
-void TerminalProcess::setRunAsRoot(bool on)
-{
-    d->m_runAsRoot = on;
-}
-
 QProcess::ProcessError TerminalProcess::error() const
 {
     return d->m_error;
diff --git a/src/libs/utils/terminalprocess_p.h b/src/libs/utils/terminalprocess_p.h
index 006b3c3d8a0..0fb2006049e 100644
--- a/src/libs/utils/terminalprocess_p.h
+++ b/src/libs/utils/terminalprocess_p.h
@@ -52,8 +52,6 @@ public:
     void setEnvironment(const Environment &env);
     const Environment &environment() const;
 
-    void setRunAsRoot(bool on);
-
     QProcess::ProcessError error() const;
     QString errorString() const;
 
diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h
index fb41d3b1964..07f57bfa455 100644
--- a/src/libs/utils/theme/theme.h
+++ b/src/libs/utils/theme/theme.h
@@ -109,7 +109,6 @@ public:
         SplitterColor,
         TextColorDisabled,
         TextColorError,
-        TextColorHighlight,
         TextColorHighlightBackground,
         TextColorLink,
         TextColorLinkVisited,
diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index 34383bad3a4..9de48da0ee5 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -473,28 +473,6 @@ QString AndroidConfig::apiLevelNameFor(const SdkPlatform *platform)
                 QString("android-%1").arg(platform->apiLevel()) : "";
 }
 
-int AndroidConfig::platformNameToApiLevel(const QString &platformName)
-{
-    int apiLevel = -1;
-    static const QRegularExpression re("(android-)(?<apiLevel>[0-9A-Z]{1,})",
-                                       QRegularExpression::CaseInsensitiveOption);
-    QRegularExpressionMatch match = re.match(platformName);
-    if (match.hasMatch()) {
-        QString apiLevelStr = match.captured("apiLevel");
-        bool isUInt;
-        apiLevel = apiLevelStr.toUInt(&isUInt);
-        if (!isUInt) {
-            if (apiLevelStr == 'Q')
-                apiLevel = 29;
-            else if (apiLevelStr == 'R')
-                apiLevel = 30;
-            else if (apiLevelStr == 'S')
-                apiLevel = 31;
-        }
-    }
-    return apiLevel;
-}
-
 bool AndroidConfig::isCmdlineSdkToolsInstalled() const
 {
     QString toolPath("cmdline-tools/latest/bin/sdkmanager");
diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h
index 701e10190e9..7492ae0f2a3 100644
--- a/src/plugins/android/androidconfigurations.h
+++ b/src/plugins/android/androidconfigurations.h
@@ -91,7 +91,6 @@ public:
 
     static QStringList apiLevelNamesFor(const SdkPlatformList &platforms);
     static QString apiLevelNameFor(const SdkPlatform *platform);
-    static int platformNameToApiLevel(const QString &platformName);
 
     Utils::FilePath sdkLocation() const;
     void setSdkLocation(const Utils::FilePath &sdkLocation);
diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp
index 7a59abea961..a14b985ad74 100644
--- a/src/plugins/android/androiddevice.cpp
+++ b/src/plugins/android/androiddevice.cpp
@@ -673,23 +673,24 @@ AndroidDeviceFactory::AndroidDeviceFactory()
                     ":/android/images/androiddevice.png");
 
     setConstructionFunction(&AndroidDevice::create);
-    setCanCreate(m_androidConfig.sdkToolsOk());
-    setCreator([this] {
-        AvdDialog dialog = AvdDialog(m_androidConfig, Core::ICore::dialogParent());
-        if (dialog.exec() != QDialog::Accepted)
-            return IDevice::Ptr();
+    if (m_androidConfig.sdkToolsOk()) {
+        setCreator([this] {
+            AvdDialog dialog = AvdDialog(m_androidConfig, Core::ICore::dialogParent());
+            if (dialog.exec() != QDialog::Accepted)
+                return IDevice::Ptr();
 
-        const IDevice::Ptr dev = dialog.device();
-        if (const auto androidDev = static_cast<AndroidDevice *>(dev.data())) {
-            qCDebug(androidDeviceLog, "Created new Android AVD id \"%s\".",
-                    qPrintable(androidDev->avdName()));
-        } else {
-            AndroidDeviceWidget::criticalDialog(
-                    AndroidDevice::tr("The device info returned from AvdDialog is invalid."));
-        }
+            const IDevice::Ptr dev = dialog.device();
+            if (const auto androidDev = static_cast<AndroidDevice *>(dev.data())) {
+                qCDebug(androidDeviceLog, "Created new Android AVD id \"%s\".",
+                        qPrintable(androidDev->avdName()));
+            } else {
+                AndroidDeviceWidget::criticalDialog(
+                        AndroidDevice::tr("The device info returned from AvdDialog is invalid."));
+            }
 
-        return IDevice::Ptr(dev);
-    });
+            return IDevice::Ptr(dev);
+        });
+    }
 }
 
 } // namespace Internal
diff --git a/src/plugins/android/androidsdkmanager.cpp b/src/plugins/android/androidsdkmanager.cpp
index 16c75a8e622..15636de0789 100644
--- a/src/plugins/android/androidsdkmanager.cpp
+++ b/src/plugins/android/androidsdkmanager.cpp
@@ -28,6 +28,7 @@
 #include "androidconfigurations.h"
 #include "androidconstants.h"
 #include "androidmanager.h"
+#include "avdmanageroutputparser.h"
 
 #include <utils/algorithm.h>
 #include <utils/qtcassert.h>
@@ -691,7 +692,7 @@ AndroidSdkPackage *SdkManagerOutputParser::parsePlatform(const QStringList &data
     SdkPlatform *platform = nullptr;
     GenericPackageData packageData;
     if (parseAbstractData(packageData, data, 2, "Platform")) {
-        const int apiLevel = AndroidConfig::platformNameToApiLevel(packageData.headerParts.at(1));
+        const int apiLevel = platformNameToApiLevel(packageData.headerParts.at(1));
         if (apiLevel == -1) {
             qCDebug(sdkManagerLog) << "Platform: Cannot parse api level:"<< data;
             return nullptr;
@@ -711,7 +712,7 @@ QPair<SystemImage *, int> SdkManagerOutputParser::parseSystemImage(const QString
     QPair <SystemImage *, int> result(nullptr, -1);
     GenericPackageData packageData;
     if (parseAbstractData(packageData, data, 4, "System-image")) {
-        const int apiLevel = AndroidConfig::platformNameToApiLevel(packageData.headerParts.at(1));
+        const int apiLevel = platformNameToApiLevel(packageData.headerParts.at(1));
         if (apiLevel == -1) {
             qCDebug(sdkManagerLog) << "System-image: Cannot parse api level:"<< data;
             return result;
diff --git a/src/plugins/android/avdmanageroutputparser.cpp b/src/plugins/android/avdmanageroutputparser.cpp
index 2cb8a9ac0b1..803d4416e20 100644
--- a/src/plugins/android/avdmanageroutputparser.cpp
+++ b/src/plugins/android/avdmanageroutputparser.cpp
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 #include "avdmanageroutputparser.h"
-#include "androidconfigurations.h"
 
 #include <projectexplorer/projectexplorerconstants.h>
 #include <utils/algorithm.h>
@@ -34,6 +33,7 @@
 #include <utils/variant.h>
 
 #include <QLoggingCategory>
+#include <QRegularExpression>
 #include <QSettings>
 
 namespace {
@@ -98,7 +98,7 @@ static Utils::optional<AndroidDeviceInfo> parseAvd(const QStringList &deviceInfo
                 QSettings avdInfo(avdInfoFile.toString(), QSettings::IniFormat);
                 value = avdInfo.value(avdInfoTargetKey).toString();
                 if (!value.isEmpty())
-                    avd.sdk = AndroidConfig::platformNameToApiLevel(value);
+                    avd.sdk = platformNameToApiLevel(value);
                 else
                     qCDebug(avdOutputParserLog)
                         << "Avd Parsing: Cannot find sdk API:" << avdInfoFile.toString();
@@ -164,5 +164,27 @@ AndroidDeviceInfoList parseAvdList(const QString &output, QStringList *avdErrorP
     return avdList;
 }
 
+int platformNameToApiLevel(const QString &platformName)
+{
+    int apiLevel = -1;
+    static const QRegularExpression re("(android-)(?<apiLevel>[0-9A-Z]{1,})",
+                                       QRegularExpression::CaseInsensitiveOption);
+    QRegularExpressionMatch match = re.match(platformName);
+    if (match.hasMatch()) {
+        QString apiLevelStr = match.captured("apiLevel");
+        bool isUInt;
+        apiLevel = apiLevelStr.toUInt(&isUInt);
+        if (!isUInt) {
+            if (apiLevelStr == 'Q')
+                apiLevel = 29;
+            else if (apiLevelStr == 'R')
+                apiLevel = 30;
+            else if (apiLevelStr == 'S')
+                apiLevel = 31;
+        }
+    }
+    return apiLevel;
+}
+
 } // namespace Internal
 } // namespace Android
diff --git a/src/plugins/android/avdmanageroutputparser.h b/src/plugins/android/avdmanageroutputparser.h
index e5a50beae34..3788e6079d8 100644
--- a/src/plugins/android/avdmanageroutputparser.h
+++ b/src/plugins/android/avdmanageroutputparser.h
@@ -31,6 +31,7 @@ namespace Internal {
 const char avdManufacturerError[] = "no longer exists as a device";
 
 AndroidDeviceInfoList parseAvdList(const QString &output, QStringList *avdErrorPaths);
+int platformNameToApiLevel(const QString &platformName);
 
 } // namespace Internal
 } // namespace Android
diff --git a/src/plugins/baremetal/baremetaldevice.cpp b/src/plugins/baremetal/baremetaldevice.cpp
index c5679898c84..61a31e8bc59 100644
--- a/src/plugins/baremetal/baremetaldevice.cpp
+++ b/src/plugins/baremetal/baremetaldevice.cpp
@@ -126,7 +126,6 @@ BareMetalDeviceFactory::BareMetalDeviceFactory()
     setCombinedIcon(":/baremetal/images/baremetaldevicesmall.png",
                     ":/baremetal/images/baremetaldevice.png");
     setConstructionFunction(&BareMetalDevice::create);
-    setCanCreate(true);
     setCreator([] {
         BareMetalDeviceConfigurationWizard wizard;
         if (wizard.exec() != QDialog::Accepted)
diff --git a/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp
index c853df8b265..7cd8d3f7002 100644
--- a/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp
@@ -96,7 +96,8 @@ CommandLine StLinkUtilGdbServerProvider::command() const
     if (!m_resetBoard)
         cmd.addArg("--no-reset");
 
-    cmd.addArg("--stlink_version=" + QString::number(m_transport));
+    if (m_transport != UnspecifiedTransport)
+        cmd.addArg("--stlink_version=" + QString::number(m_transport));
     cmd.addArg("--listen_port=" + QString::number(channel().port()));
     cmd.addArg("--verbose=" + QString::number(m_verboseLevel));
 
@@ -301,6 +302,9 @@ void StLinkUtilGdbServerProviderConfigWidget::populateTransportLayers()
     m_transportLayerComboBox->insertItem(
                 m_transportLayerComboBox->count(), tr("ST-LINK/V2"),
                 StLinkUtilGdbServerProvider::RawUsb);
+    m_transportLayerComboBox->insertItem(
+                m_transportLayerComboBox->count(), tr("Keep unspecified"),
+                StLinkUtilGdbServerProvider::UnspecifiedTransport);
 }
 
 void StLinkUtilGdbServerProviderConfigWidget::setFromProvider()
diff --git a/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.h b/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.h
index a5d8a6f82a7..6cef0ea9c2c 100644
--- a/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.h
+++ b/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.h
@@ -42,7 +42,7 @@ namespace Internal {
 class StLinkUtilGdbServerProvider final : public GdbServerProvider
 {
 public:
-    enum TransportLayer { ScsiOverUsb = 1, RawUsb = 2 };
+    enum TransportLayer { ScsiOverUsb = 1, RawUsb = 2, UnspecifiedTransport };
 
     QVariantMap toMap() const final;
     bool fromMap(const QVariantMap &data) final;
diff --git a/src/plugins/boot2qt/qdbdevice.cpp b/src/plugins/boot2qt/qdbdevice.cpp
index e372c92b622..7b858747e50 100644
--- a/src/plugins/boot2qt/qdbdevice.cpp
+++ b/src/plugins/boot2qt/qdbdevice.cpp
@@ -287,7 +287,6 @@ QdbLinuxDeviceFactory::QdbLinuxDeviceFactory()
     setDisplayName(QdbDevice::tr("Boot2Qt Device"));
     setCombinedIcon(":/qdb/images/qdbdevicesmall.png", ":/qdb/images/qdbdevice.png");
     setConstructionFunction(&QdbDevice::create);
-    setCanCreate(true);
     setCreator([] {
         QdbDeviceWizard wizard(Core::ICore::dialogParent());
         if (wizard.exec() != QDialog::Accepted)
diff --git a/src/plugins/clangcodemodel/clangtextmark.cpp b/src/plugins/clangcodemodel/clangtextmark.cpp
index f7160df1237..77eabc2f04d 100644
--- a/src/plugins/clangcodemodel/clangtextmark.cpp
+++ b/src/plugins/clangcodemodel/clangtextmark.cpp
@@ -415,7 +415,7 @@ ClangdTextMark::ClangdTextMark(const FilePath &filePath,
     QVector<QAction *> actions;
     QAction *action = new QAction();
     action->setIcon(QIcon::fromTheme("edit-copy", Icons::COPY.icon()));
-    action->setToolTip(tr("Clang Code Model Marks", "Copy to Clipboard"));
+    action->setToolTip(tr("Copy to Clipboard", "Clang Code Model Marks"));
     QObject::connect(action, &QAction::triggered, [diag = m_diagnostic]() {
         const QString text = ClangDiagnosticWidget::createText({diag},
                                                                ClangDiagnosticWidget::InfoBar);
diff --git a/src/plugins/clangcodemodel/test/clangdtests.cpp b/src/plugins/clangcodemodel/test/clangdtests.cpp
index 5a23440eb1c..36217ad8d76 100644
--- a/src/plugins/clangcodemodel/test/clangdtests.cpp
+++ b/src/plugins/clangcodemodel/test/clangdtests.cpp
@@ -654,6 +654,10 @@ void ClangdTestTooltips::test()
     timer.stop();
 
     QEXPECT_FAIL("TypeName_ResolveTemplateTypeAlias", "typedef already resolved in AST", Abort);
+    if (client()->versionNumber() >= QVersionNumber(14)) {
+        QEXPECT_FAIL("TypeNameIntroducedByUsingDeclarationQualified",
+                     "https://github.com/clangd/clangd/issues/989", Abort);
+    }
     QCOMPARE(int(helpItem.category()), expectedCategory);
     QEXPECT_FAIL("TemplateClassQualified", "Additional look-up needed?", Abort);
     QCOMPARE(helpItem.helpIds(), expectedIds);
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
index 02f596728dd..0acbd3ddc27 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
@@ -135,6 +135,7 @@ private:
     void batchEditConfiguration();
     void reconfigureWithInitialParameters(CMakeBuildConfiguration *bc);
     void updateInitialCMakeArguments();
+    void kitCMakeConfiguration();
 
     CMakeBuildConfiguration *m_buildConfiguration;
     QTreeView *m_configView;
@@ -155,6 +156,7 @@ private:
     InfoLabel *m_warningMessageLabel;
 
     QPushButton *m_batchEditButton = nullptr;
+    QPushButton *m_kitConfiguration = nullptr;
 };
 
 static QModelIndex mapToSource(const QAbstractItemView *view, const QModelIndex &idx)
@@ -220,6 +222,11 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc)
         updateConfigurationStateIndex(index);
     });
 
+    m_kitConfiguration = new QPushButton(tr("Kit Configuration"));
+    m_kitConfiguration->setToolTip(tr("Edit the current kit's CMake configuration."));
+    m_kitConfiguration->setFixedWidth(m_kitConfiguration->sizeHint().width());
+    connect(m_kitConfiguration, &QPushButton::clicked, this, [this]() { kitCMakeConfiguration(); });
+
     m_filterEdit = new FancyLineEdit;
     m_filterEdit->setPlaceholderText(tr("Filter"));
     m_filterEdit->setFiltering(true);
@@ -253,6 +260,7 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc)
     auto stretcher = new HeaderViewStretcher(m_configView->header(), 0);
     m_configView->setSelectionMode(QAbstractItemView::ExtendedSelection);
     m_configView->setSelectionBehavior(QAbstractItemView::SelectItems);
+    m_configView->setAlternatingRowColors(true);
     m_configView->setFrameShape(QFrame::NoFrame);
     m_configView->setItemDelegate(new ConfigModelItemDelegate(m_buildConfiguration->project()->projectDirectory(),
                                                               m_configView));
@@ -332,12 +340,12 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc)
         },
         m_warningMessageLabel,
         Space(10),
-        m_configurationStates,
+        Row{m_kitConfiguration, m_configurationStates},
         Group {
             cmakeConfiguration,
             Row {
                 bc->aspect<InitialCMakeArgumentsAspect>(),
-                bc->aspect<AdditionalCMakeArgumentsAspect>()
+                bc->aspect<AdditionalCMakeOptionsAspect>()
             },
             m_reconfigureButton,
         }
@@ -484,6 +492,23 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc)
         updateInitialCMakeArguments();
     });
 
+    connect(bc->aspect<InitialCMakeArgumentsAspect>(),
+            &Utils::BaseAspect::labelLinkActivated,
+            this,
+            [this](const QString &link) {
+                const CMakeTool *tool = CMakeKitAspect::cmakeTool(
+                    m_buildConfiguration->target()->kit());
+                CMakeTool::openCMakeHelpUrl(tool, "%1/manual/cmake.1.html#options");
+            });
+    connect(bc->aspect<AdditionalCMakeOptionsAspect>(),
+            &Utils::BaseAspect::labelLinkActivated,
+            this,
+            [this](const QString &link) {
+                const CMakeTool *tool = CMakeKitAspect::cmakeTool(
+                    m_buildConfiguration->target()->kit());
+                CMakeTool::openCMakeHelpUrl(tool, "%1/manual/cmake.1.html#options");
+            });
+
     updateSelection();
     updateConfigurationStateSelection();
 }
@@ -498,10 +523,14 @@ void CMakeBuildSettingsWidget::batchEditConfiguration()
     auto editor = new QPlainTextEdit(dialog);
 
     auto label = new QLabel(dialog);
-    label->setText(tr("Enter one CMake variable per line.\n"
-       "To set or change a variable, use -D<variable>:<type>=<value>.\n"
-       "<type> can have one of the following values: FILEPATH, PATH, BOOL, INTERNAL, or STRING.\n"
-       "To unset a variable, use -U<variable>.\n"));
+    label->setText(tr("Enter one CMake <a href=\"variable\">variable</a> per line.<br/>"
+       "To set or change a variable, use -D&lt;variable&gt;:&lt;type&gt;=&lt;value&gt;.<br/>"
+       "&lt;type&gt; can have one of the following values: FILEPATH, PATH, BOOL, INTERNAL, or STRING.<br/>"
+                      "To unset a variable, use -U&lt;variable&gt;.<br/>"));
+    connect(label, &QLabel::linkActivated, this, [this](const QString &link) {
+        const CMakeTool *tool = CMakeKitAspect::cmakeTool(m_buildConfiguration->target()->kit());
+        CMakeTool::openCMakeHelpUrl(tool, "%1/manual/cmake-variables.7.html");
+    });
     editor->setMinimumSize(800, 200);
 
     auto chooser = new Utils::VariableChooser(dialog);
@@ -525,9 +554,9 @@ void CMakeBuildSettingsWidget::batchEditConfiguration()
                                                return expander->expand(s);
                                            });
         const bool isInitial = isInitialConfiguration();
-        QStringList unknownArguments;
+        QStringList unknownOptions;
         CMakeConfig config = CMakeConfig::fromArguments(isInitial ? lines : expandedLines,
-                                                        unknownArguments);
+                                                        unknownOptions);
         for (auto &ci : config)
             ci.isInitial = isInitial;
 
@@ -602,6 +631,38 @@ void CMakeBuildSettingsWidget::updateInitialCMakeArguments()
         m_buildConfiguration->aspect<InitialCMakeArgumentsAspect>()->value()));
 }
 
+void CMakeBuildSettingsWidget::kitCMakeConfiguration()
+{
+    m_buildConfiguration->kit()->blockNotification();
+
+    auto dialog = new QDialog(this);
+    dialog->setWindowTitle(tr("Kit CMake Configuration"));
+    dialog->setAttribute(Qt::WA_DeleteOnClose);
+    dialog->setModal(true);
+    connect(dialog, &QDialog::finished, this, [=]{
+        m_buildConfiguration->kit()->unblockNotification();
+    });
+
+    CMakeKitAspect kitAspect;
+    CMakeGeneratorKitAspect generatorAspect;
+    CMakeConfigurationKitAspect configurationKitAspect;
+
+    auto layout = new QGridLayout(dialog);
+
+    kitAspect.createConfigWidget(m_buildConfiguration->kit())
+        ->addToLayoutWithLabel(layout->parentWidget());
+    generatorAspect.createConfigWidget(m_buildConfiguration->kit())
+        ->addToLayoutWithLabel(layout->parentWidget());
+    configurationKitAspect.createConfigWidget(m_buildConfiguration->kit())
+        ->addToLayoutWithLabel(layout->parentWidget());
+
+    layout->setColumnStretch(1, 1);
+
+    dialog->setMinimumWidth(400);
+    dialog->resize(800, 1);
+    dialog->show();
+}
+
 void CMakeBuildSettingsWidget::setError(const QString &message)
 {
     m_buildConfiguration->buildDirectoryAspect()->setProblem(message);
@@ -658,10 +719,10 @@ void CMakeBuildSettingsWidget::updateButtonState()
     m_resetButton->setEnabled(m_configModel->hasChanges(isInitial) && !isParsing);
 
     m_buildConfiguration->aspect<InitialCMakeArgumentsAspect>()->setVisible(isInitialConfiguration());
-    m_buildConfiguration->aspect<AdditionalCMakeArgumentsAspect>()->setVisible(!isInitialConfiguration());
+    m_buildConfiguration->aspect<AdditionalCMakeOptionsAspect>()->setVisible(!isInitialConfiguration());
 
     m_buildConfiguration->aspect<InitialCMakeArgumentsAspect>()->setEnabled(!isParsing);
-    m_buildConfiguration->aspect<AdditionalCMakeArgumentsAspect>()->setEnabled(!isParsing);
+    m_buildConfiguration->aspect<AdditionalCMakeOptionsAspect>()->setEnabled(!isParsing);
 
     // Update label and text boldness of the reconfigure button
     QFont reconfigureButtonFont = m_reconfigureButton->font();
@@ -704,12 +765,27 @@ void CMakeBuildSettingsWidget::updateFromKit()
     const Kit *k = m_buildConfiguration->kit();
     const CMakeConfig config = CMakeConfigurationKitAspect::configuration(k);
 
+    // First the key value parameters
     ConfigModel::KitConfiguration configHash;
     for (const CMakeConfigItem &i : config)
-        configHash.insert(QString::fromUtf8(i.key),
-                          qMakePair(QString::fromUtf8(i.value), i.expandedValue(k)));
+        configHash.insert(QString::fromUtf8(i.key), i);
 
     m_configModel->setConfigurationFromKit(configHash);
+
+    // Then the additional parameters
+    const QStringList additionalKitCMake = ProcessArgs::splitArgs(
+        CMakeConfigurationKitAspect::additionalConfiguration(k));
+    const QStringList additionalInitialCMake = ProcessArgs::splitArgs(
+        m_buildConfiguration->aspect<InitialCMakeArgumentsAspect>()->value());
+
+    QStringList mergedArgumentList;
+    std::set_union(additionalInitialCMake.begin(),
+                   additionalInitialCMake.end(),
+                   additionalKitCMake.begin(),
+                   additionalKitCMake.end(),
+                   std::back_inserter(mergedArgumentList));
+    m_buildConfiguration->aspect<InitialCMakeArgumentsAspect>()->setValue(
+        ProcessArgs::joinArgs(mergedArgumentList));
 }
 
 void CMakeBuildSettingsWidget::updateConfigurationStateIndex(int index)
@@ -885,6 +961,18 @@ bool CMakeBuildSettingsWidget::eventFilter(QObject *target, QEvent *event)
     auto menu = new QMenu(this);
     connect(menu, &QMenu::triggered, menu, &QMenu::deleteLater);
 
+    auto help = new QAction(tr("Help"), this);
+    menu->addAction(help);
+    connect(help, &QAction::triggered, this, [=] {
+        const CMakeConfigItem item = ConfigModel::dataItemFromIndex(idx).toCMakeConfigItem();
+
+        const CMakeTool *tool = CMakeKitAspect::cmakeTool(m_buildConfiguration->target()->kit());
+        const QString linkUrl = "%1/variable/" + QString::fromUtf8(item.key) + ".html";
+        CMakeTool::openCMakeHelpUrl(tool, linkUrl);
+    });
+
+    menu->addSeparator();
+
     QAction *action = nullptr;
     if ((action = createForceAction(ConfigModel::DataItem::BOOLEAN, idx)))
         menu->addAction(action);
@@ -1052,7 +1140,7 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id)
     auto initialCMakeArgumentsAspect = addAspect<InitialCMakeArgumentsAspect>();
     initialCMakeArgumentsAspect->setMacroExpanderProvider([this] { return macroExpander(); });
 
-    auto additionalCMakeArgumentsAspect = addAspect<AdditionalCMakeArgumentsAspect>();
+    auto additionalCMakeArgumentsAspect = addAspect<AdditionalCMakeOptionsAspect>();
     additionalCMakeArgumentsAspect->setMacroExpanderProvider([this] { return macroExpander(); });
 
     macroExpander()->registerVariable(DEVELOPMENT_TEAM_FLAG,
@@ -1352,7 +1440,7 @@ void CMakeBuildConfiguration::setInitialCMakeArguments(const QStringList &args)
 
 QStringList CMakeBuildConfiguration::additionalCMakeArguments() const
 {
-    return ProcessArgs::splitArgs(aspect<AdditionalCMakeArgumentsAspect>()->value());
+    return ProcessArgs::splitArgs(aspect<AdditionalCMakeOptionsAspect>()->value());
 }
 
 void CMakeBuildConfiguration::setAdditionalCMakeArguments(const QStringList &args)
@@ -1364,7 +1452,7 @@ void CMakeBuildConfiguration::setAdditionalCMakeArguments(const QStringList &arg
                                                                     [](const QString &s) {
                                                                         return !s.isEmpty();
                                                                     });
-    aspect<AdditionalCMakeArgumentsAspect>()->setValue(
+    aspect<AdditionalCMakeOptionsAspect>()->setValue(
         ProcessArgs::joinArgs(nonEmptyAdditionalArguments));
 }
 
@@ -1373,13 +1461,13 @@ void CMakeBuildConfiguration::filterConfigArgumentsFromAdditionalCMakeArguments(
     // On iOS the %{Ios:DevelopmentTeam:Flag} evalues to something like
     // -DCMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM:STRING=MAGICSTRING
     // which is already part of the CMake variables and should not be also
-    // in the addtional CMake parameters
+    // in the addtional CMake options
     const QStringList arguments = ProcessArgs::splitArgs(
-        aspect<AdditionalCMakeArgumentsAspect>()->value());
-    QStringList unknownArguments;
-    const CMakeConfig config = CMakeConfig::fromArguments(arguments, unknownArguments);
+        aspect<AdditionalCMakeOptionsAspect>()->value());
+    QStringList unknownOptions;
+    const CMakeConfig config = CMakeConfig::fromArguments(arguments, unknownOptions);
 
-    aspect<AdditionalCMakeArgumentsAspect>()->setValue(ProcessArgs::joinArgs(unknownArguments));
+    aspect<AdditionalCMakeOptionsAspect>()->setValue(ProcessArgs::joinArgs(unknownOptions));
 }
 
 void CMakeBuildConfiguration::setError(const QString &message)
@@ -1635,7 +1723,7 @@ const QStringList InitialCMakeArgumentsAspect::allValues() const
     return initialCMakeArguments;
 }
 
-void InitialCMakeArgumentsAspect::setAllValues(const QString &values, QStringList &additionalArguments)
+void InitialCMakeArgumentsAspect::setAllValues(const QString &values, QStringList &additionalOptions)
 {
     QStringList arguments = values.split('\n', Qt::SkipEmptyParts);
     for (QString &arg: arguments) {
@@ -1646,13 +1734,13 @@ void InitialCMakeArgumentsAspect::setAllValues(const QString &values, QStringLis
         if (arg.startsWith("-T"))
             arg.replace("-T", "-DCMAKE_GENERATOR_TOOLSET:STRING=");
     }
-    m_cmakeConfiguration = CMakeConfig::fromArguments(arguments, additionalArguments);
+    m_cmakeConfiguration = CMakeConfig::fromArguments(arguments, additionalOptions);
     for (CMakeConfigItem &ci : m_cmakeConfiguration)
         ci.isInitial = true;
 
-    // Display the unknown arguments in "Additional CMake parameters"
-    const QString additionalArgumentsValue = ProcessArgs::joinArgs(additionalArguments);
-    BaseAspect::setValueQuietly(additionalArgumentsValue);
+    // Display the unknown arguments in "Additional CMake Options"
+    const QString additionalOptionsValue = ProcessArgs::joinArgs(additionalOptions);
+    BaseAspect::setValueQuietly(additionalOptionsValue);
 }
 
 void InitialCMakeArgumentsAspect::setCMakeConfiguration(const CMakeConfig &config)
@@ -1677,18 +1765,18 @@ void InitialCMakeArgumentsAspect::toMap(QVariantMap &map) const
 InitialCMakeArgumentsAspect::InitialCMakeArgumentsAspect()
 {
     setSettingsKey("CMake.Initial.Parameters");
-    setLabelText(tr("Additional CMake parameters:"));
+    setLabelText(tr("Additional CMake <a href=\"options\">options</a>:"));
     setDisplayStyle(LineEditDisplay);
 }
 
 // ----------------------------------------------------------------------
-// - AdditionalCMakeParametersAspect:
+// - AdditionalCMakeOptionsAspect:
 // ----------------------------------------------------------------------
 
-AdditionalCMakeArgumentsAspect::AdditionalCMakeArgumentsAspect()
+AdditionalCMakeOptionsAspect::AdditionalCMakeOptionsAspect()
 {
-    setSettingsKey("CMake.Additional.Parameters");
-    setLabelText(tr("Additional CMake parameters:"));
+    setSettingsKey("CMake.Additional.Options");
+    setLabelText(tr("Additional CMake <a href=\"options\">options</a>:"));
     setDisplayStyle(LineEditDisplay);
 }
 
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
index 4f6b909592e..2ac05c33d3a 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
@@ -164,12 +164,12 @@ public:
     void toMap(QVariantMap &map) const final;
 };
 
-class AdditionalCMakeArgumentsAspect final : public Utils::StringAspect
+class AdditionalCMakeOptionsAspect final : public Utils::StringAspect
 {
     Q_OBJECT
 
 public:
-    AdditionalCMakeArgumentsAspect();
+    AdditionalCMakeOptionsAspect();
 };
 
 class SourceDirectoryAspect final : public Utils::StringAspect
diff --git a/src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp b/src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp
index a2eabe627ab..9347d84eccb 100644
--- a/src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp
@@ -310,7 +310,7 @@ static CMakeConfigItem unsetItemFromString(const QString &input)
     return item;
 }
 
-CMakeConfig CMakeConfig::fromArguments(const QStringList &list, QStringList &unknownArguments)
+CMakeConfig CMakeConfig::fromArguments(const QStringList &list, QStringList &unknownOptions)
 {
     CMakeConfig result;
     bool inSet = false;
@@ -343,7 +343,7 @@ CMakeConfig CMakeConfig::fromArguments(const QStringList &list, QStringList &unk
             continue;
         }
 
-        unknownArguments.append(i);
+        unknownOptions.append(i);
     }
     return result;
 }
diff --git a/src/plugins/cmakeprojectmanager/cmakeconfigitem.h b/src/plugins/cmakeprojectmanager/cmakeconfigitem.h
index 056a31ac986..10a8d8b7174 100644
--- a/src/plugins/cmakeprojectmanager/cmakeconfigitem.h
+++ b/src/plugins/cmakeprojectmanager/cmakeconfigitem.h
@@ -91,7 +91,7 @@ public:
 
     const QList<CMakeConfigItem> &toList() const { return *this; }
 
-    static CMakeConfig fromArguments(const QStringList &list, QStringList &unknownArguments);
+    static CMakeConfig fromArguments(const QStringList &list, QStringList &unknownOptions);
     static CMakeConfig fromFile(const Utils::FilePath &input, QString *errorMessage);
 
     QByteArray valueOf(const QByteArray &key) const;
diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
index 14783dcf4e9..33224d439d1 100644
--- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
@@ -352,6 +352,11 @@ public:
           m_label(createSubWidget<ElidingLabel>()),
           m_changeButton(createSubWidget<QPushButton>())
     {
+        const CMakeTool *tool = CMakeKitAspect::cmakeTool(kit);
+        connect(this, &KitAspectWidget::labelLinkActivated, this, [=](const QString &link) {
+            CMakeTool::openCMakeHelpUrl(tool, "%1/manual/cmake-generators.7.html");
+        });
+
         m_label->setToolTip(ki->description());
         m_changeButton->setText(tr("Change..."));
         refresh();
@@ -391,12 +396,18 @@ private:
         const QString platform = CMakeGeneratorKitAspect::platform(kit());
         const QString toolset = CMakeGeneratorKitAspect::toolset(kit());
 
-        const QString message = tr("%1 - %2, Platform: %3, Toolset: %4")
-                .arg(extraGenerator.isEmpty() ? tr("<none>") : extraGenerator)
-                .arg(generator.isEmpty() ? tr("<none>") : generator)
-                .arg(platform.isEmpty() ? tr("<none>") : platform)
-                .arg(toolset.isEmpty() ? tr("<none>") : toolset);
-        m_label->setText(message);
+        QStringList messageLabel;
+        if (!extraGenerator.isEmpty())
+            messageLabel << extraGenerator << " - ";
+
+        messageLabel << generator;
+
+        if (!platform.isEmpty())
+            messageLabel << ", " << tr("Platform") << ": " << platform;
+        if (!toolset.isEmpty())
+            messageLabel << ", " << tr("Toolset") << ": " << toolset;
+
+        m_label->setText(messageLabel.join(""));
     }
 
     void changeGenerator()
@@ -490,6 +501,8 @@ private:
                                          extraGeneratorCombo->currentData().toString(),
                                          platformEdit->isEnabled() ? platformEdit->text() : QString(),
                                          toolsetEdit->isEnabled() ? toolsetEdit->text() : QString());
+
+            refresh();
         }
     }
 
@@ -561,7 +574,7 @@ CMakeGeneratorKitAspect::CMakeGeneratorKitAspect()
 {
     setObjectName(QLatin1String("CMakeGeneratorKitAspect"));
     setId(GENERATOR_ID);
-    setDisplayName(tr("CMake generator"));
+    setDisplayName(tr("CMake <a href=\"generator\">generator</a>"));
     setDescription(tr("CMake generator defines how a project is built when using CMake.<br>"
                       "This setting is ignored when using other build systems."));
     setPriority(19000);
@@ -925,15 +938,20 @@ private:
 
         QTC_ASSERT(!m_editor, return);
 
+        const CMakeTool *tool = CMakeKitAspect::cmakeTool(kit());
+
         m_dialog = new QDialog(m_summaryLabel->window());
         m_dialog->setWindowTitle(tr("Edit CMake Configuration"));
         auto layout = new QVBoxLayout(m_dialog);
         m_editor = new QPlainTextEdit;
         auto editorLabel = new QLabel(m_dialog);
-        editorLabel->setText(tr("Enter one CMake variable per line.\n"
-                                "To set a variable, use -D<variable>:<type>=<value>.\n"
-                                "<type> can have one of the following values: FILEPATH, PATH, "
+        editorLabel->setText(tr("Enter one CMake <a href=\"variable\">variable</a> per line.<br/>"
+                                "To set a variable, use -D&lt;variable&gt;:&lt;type&gt;=&lt;value&gt;.<br/>"
+                                "&lt;type&gt; can have one of the following values: FILEPATH, PATH, "
                                 "BOOL, INTERNAL, or STRING."));
+        connect(editorLabel, &QLabel::linkActivated, this, [=](const QString &link) {
+            CMakeTool::openCMakeHelpUrl(tool, "%1/manual/cmake-variables.7.html");
+        });
         m_editor->setMinimumSize(800, 200);
 
         auto chooser = new VariableChooser(m_dialog);
@@ -942,7 +960,10 @@ private:
 
         m_additionalEditor = new QLineEdit;
         auto additionalLabel = new QLabel(m_dialog);
-        additionalLabel->setText(tr("Additional CMake parameters: "));
+        additionalLabel->setText(tr("Additional CMake <a href=\"options\">options</a>:"));
+        connect(additionalLabel, &QLabel::linkActivated, this, [=](const QString &link) {
+            CMakeTool::openCMakeHelpUrl(tool, "%1/manual/cmake.1.html#options");
+        });
 
         auto additionalChooser = new VariableChooser(m_dialog);
         additionalChooser->addSupportedWidget(m_additionalEditor);
@@ -984,16 +1005,16 @@ private:
         QTC_ASSERT(m_editor, return);
         KitGuard guard(kit());
 
-        QStringList unknownArguments;
+        QStringList unknownOptions;
         const CMakeConfig config = CMakeConfig::fromArguments(m_editor->toPlainText().split('\n'),
-                                                              unknownArguments);
+                                                              unknownOptions);
         CMakeConfigurationKitAspect::setConfiguration(kit(), config);
 
         QString additionalConfiguration = m_additionalEditor->text();
-        if (!unknownArguments.isEmpty()) {
+        if (!unknownOptions.isEmpty()) {
             if (!additionalConfiguration.isEmpty())
                 additionalConfiguration += " ";
-            additionalConfiguration += ProcessArgs::joinArgs(unknownArguments);
+            additionalConfiguration += ProcessArgs::joinArgs(unknownOptions);
         }
         CMakeConfigurationKitAspect::setAdditionalConfiguration(kit(), additionalConfiguration);
     }
diff --git a/src/plugins/cmakeprojectmanager/cmaketool.cpp b/src/plugins/cmakeprojectmanager/cmaketool.cpp
index d407adeb66a..f4cc060e659 100644
--- a/src/plugins/cmakeprojectmanager/cmaketool.cpp
+++ b/src/plugins/cmakeprojectmanager/cmaketool.cpp
@@ -27,6 +27,8 @@
 
 #include "cmaketoolmanager.h"
 
+#include <coreplugin/helpmanager.h>
+
 #include <utils/algorithm.h>
 #include <utils/environment.h>
 #include <utils/qtcassert.h>
@@ -380,6 +382,34 @@ FilePath CMakeTool::searchQchFile(const FilePath &executable)
     return {};
 }
 
+QString CMakeTool::documentationUrl(const Version &version, bool online)
+{
+    if (online) {
+        QString helpVersion = "latest";
+        if (!(version.major == 0 && version.minor == 0))
+            helpVersion = QString("v%1.%2").arg(version.major).arg(version.minor);
+
+        return QString("https://cmake.org/cmake/help/%1").arg(helpVersion);
+    }
+
+    return QString("qthelp://org.cmake.%1.%2.%3/doc")
+        .arg(version.major)
+        .arg(version.minor)
+        .arg(version.patch);
+}
+
+void CMakeTool::openCMakeHelpUrl(const CMakeTool *tool, const QString &linkUrl)
+{
+    bool online = true;
+    Version version;
+    if (tool && tool->isValid()) {
+        online = tool->qchFilePath().isEmpty();
+        version = tool->version();
+    }
+
+    Core::HelpManager::showHelpUrl(linkUrl.arg(documentationUrl(version, online)));
+}
+
 void CMakeTool::readInformation() const
 {
     QTC_ASSERT(m_introspection, return );
diff --git a/src/plugins/cmakeprojectmanager/cmaketool.h b/src/plugins/cmakeprojectmanager/cmaketool.h
index c45fb7514db..dbe65b15cc8 100644
--- a/src/plugins/cmakeprojectmanager/cmaketool.h
+++ b/src/plugins/cmakeprojectmanager/cmaketool.h
@@ -112,6 +112,9 @@ public:
     QString detectionSource() const { return m_detectionSource; }
     void setDetectionSource(const QString &source) { m_detectionSource = source; }
 
+    static QString documentationUrl(const Version &version, bool online);
+    static void openCMakeHelpUrl(const CMakeTool *tool, const QString &linkUrl);
+
 private:
     void readInformation() const;
 
diff --git a/src/plugins/cmakeprojectmanager/configmodel.cpp b/src/plugins/cmakeprojectmanager/configmodel.cpp
index af33564d5da..190ffbc9120 100644
--- a/src/plugins/cmakeprojectmanager/configmodel.cpp
+++ b/src/plugins/cmakeprojectmanager/configmodel.cpp
@@ -64,6 +64,18 @@ QVariant ConfigModel::data(const QModelIndex &idx, int role) const
     return Utils::TreeModel<>::data(idx, role);
 }
 
+bool ConfigModel::setData(const QModelIndex &idx, const QVariant &data, int role)
+{
+    Utils::TreeItem *item = itemForIndex(idx);
+    bool res = item ? item->setData(idx.column(), data, role) : false;
+    if (res) {
+        const QModelIndex keyIdx = idx.sibling(idx.row(), 0);
+        const QModelIndex valueIdx = idx.sibling(idx.row(), 1);
+        emit dataChanged(keyIdx, valueIdx);
+    }
+    return res;
+}
+
 ConfigModel::~ConfigModel() = default;
 
 void ConfigModel::appendConfiguration(const QString &key,
@@ -84,9 +96,9 @@ void ConfigModel::appendConfiguration(const QString &key,
     internalItem.isUserNew = true;
 
     if (m_kitConfiguration.contains(key))
-        internalItem.kitValue = isInitial ? m_kitConfiguration.value(key).first
-                                          : m_kitConfiguration.value(key).second;
-
+        internalItem.kitValue = QString::fromUtf8(
+            isInitial ? m_kitConfiguration.value(key).value
+                      : m_macroExpander->expand(m_kitConfiguration.value(key).value));
     m_configuration.append(internalItem);
     setConfiguration(m_configuration);
 }
@@ -99,12 +111,38 @@ void ConfigModel::setConfiguration(const QList<DataItem> &config)
 void ConfigModel::setConfigurationFromKit(const KitConfiguration &kitConfig)
 {
     m_kitConfiguration = kitConfig;
+    QHash<QString, InternalDataItem> initialConfig;
 
+    // Update the kit values for initial configuration keys
     for (InternalDataItem &i : m_configuration) {
+        if (!i.isInitial)
+            continue;
         if (m_kitConfiguration.contains(i.key))
-            i.kitValue = i.isInitial ? m_kitConfiguration.value(i.key).first
-                                     : m_kitConfiguration.value(i.key).second;
+            i.kitValue = QString::fromUtf8(m_kitConfiguration.value(i.key).value);
+        initialConfig.insert(i.key, i);
     }
+
+    // Add new initial configuration kit keys
+    for (const auto &ki : kitConfig) {
+        if (!initialConfig.contains(QString::fromUtf8(ki.key))) {
+            InternalDataItem i((DataItem(ki)));
+            i.isUserNew = true;
+            i.isInitial = true;
+            i.newValue = i.value;
+            i.kitValue = i.value;
+            m_configuration.append(i);
+        }
+    }
+
+    // Remove kit values when the kit's keys are removed
+    for (const auto &i : initialConfig) {
+        if (!kitConfig.contains(i.key)) {
+            auto existing = std::find(m_configuration.begin(), m_configuration.end(), i);
+            if (existing != m_configuration.end())
+                existing->kitValue.clear();
+        }
+    }
+
     setConfiguration(m_configuration);
 }
 
@@ -276,11 +314,15 @@ void ConfigModel::setBatchEditConfiguration(const CMakeConfig &config)
         auto existing = std::find(m_configuration.begin(), m_configuration.end(), di);
         if (existing != m_configuration.end()) {
             existing->isUnset = c.isUnset;
-            if (!c.isUnset) {
-                existing->isUserChanged = true;
+            const QString newValue = QString::fromUtf8(c.value);
+            // Allow a different value when the user didn't change anything (don't mark the same value as new)
+            // But allow the same value (going back) when the user did a change
+            const bool canSetValue = (existing->value != newValue && !existing->isUserChanged)
+                                     || existing->isUserChanged;
+            if (!c.isUnset && canSetValue) {
+                existing->isUserChanged = existing->value != newValue;
                 existing->setType(c.type);
-                existing->value = QString::fromUtf8(c.value);
-                existing->newValue = existing->value;
+                existing->newValue = newValue;
             }
         } else if (!c.isUnset) {
             InternalDataItem i(di);
@@ -439,59 +481,53 @@ QVariant ConfigModelTreeItem::data(int column, int role) const
         return dataItem->isInitial ? "1" : "0";
     }
 
-    switch (column) {
-    case 0:
-        switch (role) {
-        case Qt::DisplayRole:
-            return dataItem->key.isEmpty() ? QCoreApplication::translate("CMakeProjectManager::ConfigModel", "<UNSET>") : dataItem->key;
-        case Qt::EditRole:
-            return dataItem->key;
-        case Qt::ToolTipRole:
-            return toolTip();
-        case Qt::FontRole: {
-            QFont font;
-            font.setBold(dataItem->isUserNew);
-            font.setStrikeOut((!dataItem->inCMakeCache && !dataItem->isUserNew) || dataItem->isUnset);
-            return font;
-        }
-        default:
-            return QVariant();
-        }
-    case 1: {
-        const QString value = currentValue();
-        const auto boolValue = CMakeConfigItem::toBool(value);
-        const bool isTrue = boolValue.has_value() && boolValue.value();
+    auto fontRole = [this]() -> QFont {
+        QFont font;
+        font.setBold((dataItem->isUserChanged || dataItem->isUserNew) && !dataItem->isUnset);
+        font.setStrikeOut((!dataItem->inCMakeCache && !dataItem->isUserNew) || dataItem->isUnset);
+        font.setItalic((dataItem->isInitial && !dataItem->kitValue.isEmpty())
+                       || (!dataItem->isInitial && !dataItem->initialValue.isEmpty()));
+        return font;
+    };
 
-        switch (role) {
-        case Qt::CheckStateRole:
-            return (dataItem->type == ConfigModel::DataItem::BOOLEAN)
-                    ? QVariant(isTrue ? Qt::Checked : Qt::Unchecked) : QVariant();
-        case Qt::DisplayRole:
-            return value;
-        case Qt::EditRole:
-            return (dataItem->type == ConfigModel::DataItem::BOOLEAN) ? QVariant(isTrue) : QVariant(value);
-        case Qt::FontRole: {
-            QFont font;
-            font.setBold((dataItem->isUserChanged || dataItem->isUserNew) && !dataItem->isUnset);
-            font.setStrikeOut((!dataItem->inCMakeCache && !dataItem->isUserNew) || dataItem->isUnset);
-            return font;
-        }
-        case Qt::ForegroundRole: {
-            bool mismatch = false;
-            if (dataItem->isInitial)
-                mismatch = !dataItem->kitValue.isEmpty() && dataItem->kitValue != value;
-            else
-                mismatch = !dataItem->initialValue.isEmpty() && dataItem->initialValue != value;
-            return Utils::creatorTheme()->color(mismatch ? Utils::Theme::TextColorHighlight
-                                                         : Utils::Theme::TextColorNormal);
-        }
-        case Qt::ToolTipRole: {
-            return toolTip();
-        }
-        default:
+    auto foregroundRole = [this](const QString &value) -> QColor {
+        bool mismatch = false;
+        if (dataItem->isInitial)
+            mismatch = !dataItem->kitValue.isEmpty() && dataItem->kitValue != value;
+        else
+            mismatch = !dataItem->initialValue.isEmpty() && dataItem->initialValue != value;
+        return Utils::creatorTheme()->color(mismatch ? Utils::Theme::TextColorError
+                                                     : Utils::Theme::TextColorNormal);
+    };
+
+    const QString value = currentValue();
+    const auto boolValue = CMakeConfigItem::toBool(value);
+    const bool isTrue = boolValue.has_value() && boolValue.value();
+
+    switch (role) {
+    case Qt::CheckStateRole:
+        if (column == 0)
             return QVariant();
-        }
-    }
+        return (dataItem->type == ConfigModel::DataItem::BOOLEAN)
+                   ? QVariant(isTrue ? Qt::Checked : Qt::Unchecked)
+                   : QVariant();
+    case Qt::DisplayRole:
+        if (column == 0)
+            return dataItem->key.isEmpty()
+                       ? QCoreApplication::translate("CMakeProjectManager::ConfigModel", "<UNSET>")
+                       : dataItem->key;
+        return value;
+    case Qt::EditRole:
+        if (column == 0)
+            return dataItem->key;
+        return (dataItem->type == ConfigModel::DataItem::BOOLEAN) ? QVariant(isTrue)
+                                                                  : QVariant(value);
+    case Qt::FontRole:
+        return fontRole();
+    case Qt::ForegroundRole:
+        return foregroundRole(value);
+    case Qt::ToolTipRole:
+        return toolTip();
     default:
         return QVariant();
     }
diff --git a/src/plugins/cmakeprojectmanager/configmodel.h b/src/plugins/cmakeprojectmanager/configmodel.h
index b50aea536a8..83e34d191b5 100644
--- a/src/plugins/cmakeprojectmanager/configmodel.h
+++ b/src/plugins/cmakeprojectmanager/configmodel.h
@@ -133,6 +133,7 @@ public:
     ~ConfigModel() override;
 
     QVariant data(const QModelIndex &idx, int role) const final;
+    bool setData(const QModelIndex &idx, const QVariant &data, int role) final;
 
     void appendConfiguration(const QString &key,
                              const QString &value = QString(),
@@ -145,7 +146,7 @@ public:
     void setInitialParametersConfiguration(const CMakeConfig &config);
     void setConfiguration(const QList<DataItem> &config);
 
-    using KitConfiguration = QHash<QString, QPair<QString,QString>>;
+    using KitConfiguration = QHash<QString, CMakeConfigItem>;
     void setConfigurationFromKit(const KitConfiguration &kitConfig);
 
     void flush();
diff --git a/src/plugins/cmakeprojectmanager/fileapireader.cpp b/src/plugins/cmakeprojectmanager/fileapireader.cpp
index 3233dbe1922..aa50147aab4 100644
--- a/src/plugins/cmakeprojectmanager/fileapireader.cpp
+++ b/src/plugins/cmakeprojectmanager/fileapireader.cpp
@@ -325,10 +325,10 @@ void FileApiReader::writeConfigurationIntoBuildDirectory(const QStringList &conf
     QTC_CHECK(buildDir.ensureWritableDir());
 
     QByteArray contents;
-    QStringList unknownArguments;
+    QStringList unknownOptions;
     contents.append("# This file is managed by Qt Creator, do not edit!\n\n");
     contents.append(
-        transform(CMakeConfig::fromArguments(configurationArguments, unknownArguments).toList(),
+        transform(CMakeConfig::fromArguments(configurationArguments, unknownOptions).toList(),
                   [](const CMakeConfigItem &item) { return item.toCMakeSetLine(nullptr); })
             .join('\n')
             .toUtf8());
diff --git a/src/plugins/coreplugin/CMakeLists.txt b/src/plugins/coreplugin/CMakeLists.txt
index a68132707f5..d73fafd14e5 100644
--- a/src/plugins/coreplugin/CMakeLists.txt
+++ b/src/plugins/coreplugin/CMakeLists.txt
@@ -1,7 +1,7 @@
 if (NOT IS_ABSOLUTE ${IDE_LOGO_PATH})
   set(IDE_LOGO_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${IDE_LOGO_PATH}")
 endif()
-configure_file(core.qrc.cmakein core_cmake.qrc)
+configure_file(core_logo.qrc.cmakein core_logo_cmake.qrc)
 
 add_qtc_plugin(Core
   DEPENDS Qt5::PrintSupport Qt5::Qml Qt5::Sql Qt5::Gui Qt5::GuiPrivate
@@ -15,7 +15,8 @@ add_qtc_plugin(Core
     actionmanager/commandsfile.cpp actionmanager/commandsfile.h
     basefilewizard.cpp basefilewizard.h
     basefilewizardfactory.cpp basefilewizardfactory.h
-    ${CMAKE_CURRENT_BINARY_DIR}/core_cmake.qrc
+    ${CMAKE_CURRENT_BINARY_DIR}/core_logo_cmake.qrc
+    core.qrc
     core_global.h
     coreconstants.h
     coreicons.cpp coreicons.h
diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc
index 3804d793098..ff855e3f4b8 100644
--- a/src/plugins/coreplugin/core.qrc
+++ b/src/plugins/coreplugin/core.qrc
@@ -1,12 +1,10 @@
 <RCC>
     <qresource prefix="/core">
-        <file alias="images/qtcreatorlogo-big.png">images/logo/128/QtProject-qtcreator.png</file>
-        <file alias="images/qtcreatorlogo-big@2x.png">images/logo/256/QtProject-qtcreator.png</file>
         <file>images/settingscategory_core.png</file>
         <file>images/settingscategory_core@2x.png</file>
         <file>images/settingscategory_design.png</file>
         <file>images/settingscategory_design@2x.png</file>
-        <file alias="images/qtlogo.png">images/logo/16/Qt_logo_green.png</file>
-        <file alias="images/qtlogo@2x.png">images/logo/32/Qt_logo_green.png</file>
+        <file>images/qtlogo.png</file>
+        <file>images/qtlogo@2x.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/coreplugin/core.qrc.cmakein b/src/plugins/coreplugin/core.qrc.cmakein
deleted file mode 100644
index 6d5cd0bc6d9..00000000000
--- a/src/plugins/coreplugin/core.qrc.cmakein
+++ /dev/null
@@ -1,10 +0,0 @@
-<RCC>
-    <qresource prefix="/core">
-    <file alias="images/qtcreatorlogo-big.png">${IDE_LOGO_PATH}/images/logo/128/QtProject-qtcreator.png</file>
-    <file alias="images/qtcreatorlogo-big@2x.png">${IDE_LOGO_PATH}/images/logo/256/QtProject-qtcreator.png</file>
-    <file alias="images/settingscategory_core.png">${CMAKE_CURRENT_SOURCE_DIR}/images/settingscategory_core.png</file>
-    <file alias="images/settingscategory_core@2x.png">${CMAKE_CURRENT_SOURCE_DIR}/images/settingscategory_core@2x.png</file>
-    <file alias="images/settingscategory_design.png">${CMAKE_CURRENT_SOURCE_DIR}/images/settingscategory_design.png</file>
-    <file alias="images/settingscategory_design@2x.png">${CMAKE_CURRENT_SOURCE_DIR}/images/settingscategory_design@2x.png</file>
-    </qresource>
-</RCC>
diff --git a/src/plugins/coreplugin/core_logo.qrc b/src/plugins/coreplugin/core_logo.qrc
new file mode 100644
index 00000000000..4e9d9c87576
--- /dev/null
+++ b/src/plugins/coreplugin/core_logo.qrc
@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/core">
+        <file alias="images/qtcreatorlogo-big.png">images/logo/128/QtProject-qtcreator.png</file>
+        <file alias="images/qtcreatorlogo-big@2x.png">images/logo/256/QtProject-qtcreator.png</file>
+    </qresource>
+</RCC>
diff --git a/src/plugins/coreplugin/core_logo.qrc.cmakein b/src/plugins/coreplugin/core_logo.qrc.cmakein
new file mode 100644
index 00000000000..f595e107031
--- /dev/null
+++ b/src/plugins/coreplugin/core_logo.qrc.cmakein
@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/core">
+    <file alias="images/qtcreatorlogo-big.png">${IDE_LOGO_PATH}/images/logo/128/QtProject-qtcreator.png</file>
+    <file alias="images/qtcreatorlogo-big@2x.png">${IDE_LOGO_PATH}/images/logo/256/QtProject-qtcreator.png</file>
+    </qresource>
+</RCC>
diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
index 3af3e92f9d1..eee6b60018e 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -37,6 +37,7 @@ Project {
                 "basefilewizardfactory.h",
                 "core.qrc",
                 "core_global.h",
+                "core_logo.qrc",
                 "coreconstants.h",
                 "coreicons.cpp",
                 "coreicons.h",
diff --git a/src/plugins/coreplugin/images/qtlogo.png b/src/plugins/coreplugin/images/qtlogo.png
new file mode 100644
index 00000000000..e4623bb7fb3
Binary files /dev/null and b/src/plugins/coreplugin/images/qtlogo.png differ
diff --git a/src/plugins/coreplugin/images/logo/32/Qt_logo_green.png b/src/plugins/coreplugin/images/qtlogo@2x.png
similarity index 100%
rename from src/plugins/coreplugin/images/logo/32/Qt_logo_green.png
rename to src/plugins/coreplugin/images/qtlogo@2x.png
diff --git a/src/plugins/coreplugin/iwelcomepage.cpp b/src/plugins/coreplugin/iwelcomepage.cpp
index 89c13f993c7..5ccf830ae56 100644
--- a/src/plugins/coreplugin/iwelcomepage.cpp
+++ b/src/plugins/coreplugin/iwelcomepage.cpp
@@ -66,6 +66,9 @@ IWelcomePage::~IWelcomePage()
 QPalette WelcomePageFrame::buttonPalette(bool isActive, bool isCursorInside, bool forText)
 {
     QPalette pal;
+    pal.setBrush(QPalette::Window, {});
+    pal.setBrush(QPalette::WindowText, {});
+
     Theme *theme = Utils::creatorTheme();
     if (isActive) {
         if (forText) {
diff --git a/src/plugins/coreplugin/welcomepagehelper.cpp b/src/plugins/coreplugin/welcomepagehelper.cpp
index e6743216ea0..6eeccbcf194 100644
--- a/src/plugins/coreplugin/welcomepagehelper.cpp
+++ b/src/plugins/coreplugin/welcomepagehelper.cpp
@@ -81,7 +81,8 @@ QWidget *panelBar(QWidget *parent)
     auto frame = new QWidget(parent);
     frame->setAutoFillBackground(true);
     frame->setMinimumWidth(WelcomePageHelpers::HSpacing);
-    QPalette pal = frame->palette();
+    QPalette pal;
+    pal.setBrush(QPalette::Window, {});
     pal.setColor(QPalette::Window, themeColor(Theme::Welcome_BackgroundPrimaryColor));
     frame->setPalette(pal);
     return frame;
diff --git a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
index 81b410a3cda..63f16e98096 100644
--- a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
+++ b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
@@ -251,7 +251,7 @@ F2TestCase::F2TestCase(CppEditorAction action,
 
     const QString curTestName = QLatin1String(QTest::currentTestFunction());
     const QString tag = QLatin1String(QTest::currentDataTag());
-    const bool useClangd = ClangdSettings::instance().useClangd();
+    const bool useClangd = m_testKit;
     if (useClangd) {
         if (curTestName == "testFollowSymbolQObjectConnect"
                 || curTestName == "testFollowSymbolQObjectOldStyleConnect") {
@@ -442,7 +442,7 @@ F2TestCase::F2TestCase(CppEditorAction action,
 //    qDebug() << "Expected line:" << expectedLine;
 //    qDebug() << "Expected column:" << expectedColumn;
 
-    if (!ClangdSettings::instance().useClangd()) {
+    if (!useClangd) {
         QEXPECT_FAIL("globalVarFromEnum", "Contributor works on a fix.", Abort);
         QEXPECT_FAIL("matchFunctionSignature_Follow_5", "foo(int) resolved as CallAST", Abort);
     }
diff --git a/src/plugins/debugger/debuggeritemmanager.cpp b/src/plugins/debugger/debuggeritemmanager.cpp
index 93b91c55591..8b3a31d2d5b 100644
--- a/src/plugins/debugger/debuggeritemmanager.cpp
+++ b/src/plugins/debugger/debuggeritemmanager.cpp
@@ -32,6 +32,7 @@
 
 #include <extensionsystem/pluginmanager.h>
 
+#include <projectexplorer/devicesupport/devicemanager.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/projectexplorericons.h>
 
@@ -957,8 +958,10 @@ void DebuggerItemManagerPrivate::restoreDebuggers()
     readDebuggers(userSettingsFileName(), false);
 
     // Auto detect current.
+    IDevice::ConstPtr desktop = DeviceManager::defaultDesktopDevice();
+    QTC_ASSERT(desktop, return);
+    autoDetectGdbOrLldbDebuggers(desktop->systemEnvironment().path(), {});
     autoDetectCdbDebuggers();
-    autoDetectGdbOrLldbDebuggers({}, {});
     autoDetectUvscDebuggers();
 }
 
diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp
index 736acadaf0e..ca638e41036 100644
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -316,7 +316,6 @@ void DebuggerRunTool::setUseTerminal(bool on)
     if (on && !d->terminalRunner && !useCdbConsole) {
         d->terminalRunner =
             new TerminalRunner(runControl(), [this] { return m_runParameters.inferior; });
-        d->terminalRunner->setRunAsRoot(m_runParameters.runAsRoot);
         addStartDependency(d->terminalRunner);
     }
     if (!on && d->terminalRunner) {
@@ -327,8 +326,6 @@ void DebuggerRunTool::setUseTerminal(bool on)
 void DebuggerRunTool::setRunAsRoot(bool on)
 {
     m_runParameters.runAsRoot = on;
-    if (d->terminalRunner)
-        d->terminalRunner->setRunAsRoot(on);
 }
 
 void DebuggerRunTool::setCommandsAfterConnect(const QString &commands)
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 811f8d42e4e..6a644892fea 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -3852,12 +3852,9 @@ void GdbEngine::setupEngine()
 
     Environment gdbEnv = rp.debugger.environment;
     gdbEnv.setupEnglishOutput();
-    if (rp.runAsRoot) {
-        CommandLine wrapped("sudo", {"-A"});
-        wrapped.addCommandLineAsArgs(gdbCommand);
-        gdbCommand = wrapped;
+    if (rp.runAsRoot)
         RunControl::provideAskPassEntry(gdbEnv);
-    }
+    m_gdbProc.setRunAsRoot(rp.runAsRoot);
 
     showMessage("STARTING " + gdbCommand.toUserOutput());
 
diff --git a/src/plugins/debugger/terminal.cpp b/src/plugins/debugger/terminal.cpp
index 1856e7620b0..fc1d228d787 100644
--- a/src/plugins/debugger/terminal.cpp
+++ b/src/plugins/debugger/terminal.cpp
@@ -188,11 +188,6 @@ void TerminalRunner::interruptProcess()
         m_stubProc->interruptProcess();
 }
 
-void TerminalRunner::setRunAsRoot(bool on)
-{
-    m_runAsRoot = on;
-}
-
 void TerminalRunner::start()
 {
     QTC_ASSERT(m_stubRunnable, reportFailure({}); return);
@@ -209,20 +204,11 @@ void TerminalRunner::start()
     connect(m_stubProc, &QtcProcess::finished,
             this, &TerminalRunner::reportDone);
 
-    CommandLine commandLine = stub.command;
-    if (m_runAsRoot) { // TODO: fix me
-        m_stubProc->setRunAsRoot(true);
-//        CommandLine wrapped("sudo", {"-A"});
-//        wrapped.addCommandLineAsArgs(commandLine);
-//        commandLine = wrapped;
-        RunControl::provideAskPassEntry(stub.environment);
-    }
-
     m_stubProc->setEnvironment(stub.environment);
     m_stubProc->setWorkingDirectory(stub.workingDirectory);
 
     // Error message for user is delivered via a signal.
-    m_stubProc->setCommand(commandLine);
+    m_stubProc->setCommand(stub.command);
     m_stubProc->start();
 }
 
diff --git a/src/plugins/debugger/terminal.h b/src/plugins/debugger/terminal.h
index 4d3679f31ab..2227bdbce4b 100644
--- a/src/plugins/debugger/terminal.h
+++ b/src/plugins/debugger/terminal.h
@@ -79,7 +79,6 @@ public:
 
     void kickoffProcess();
     void interruptProcess();
-    void setRunAsRoot(bool on);
 
 private:
     void start() final;
@@ -92,7 +91,6 @@ private:
     std::function<ProjectExplorer::Runnable()> m_stubRunnable;
     qint64 m_applicationPid = 0;
     qint64 m_applicationMainThreadId = 0;
-    bool m_runAsRoot = false;
 };
 
 } // namespace Internal
diff --git a/src/plugins/diffeditor/diffeditorplugin.cpp b/src/plugins/diffeditor/diffeditorplugin.cpp
index 90cdb054220..fc607535af5 100644
--- a/src/plugins/diffeditor/diffeditorplugin.cpp
+++ b/src/plugins/diffeditor/diffeditorplugin.cpp
@@ -1341,6 +1341,26 @@ void DiffEditor::Internal::DiffEditorPlugin::testReadPatch_data()
 
     QTest::newRow("Mode change") << patch << fileDataList9;
 
+    //////////////
+    patch = R"(diff --git a/old.sh b/new.sh
+old mode 100644
+new mode 100755
+similarity index 100%
+rename from old.sh
+rename to new.sh
+)"
+            ;
+
+    fileData1 = FileData();
+    fileData1.leftFileInfo = DiffFileInfo("old.sh");
+    fileData1.rightFileInfo = DiffFileInfo("new.sh");
+    fileData1.fileOperation = FileData::RenameFile;
+
+    QList<FileData> fileDataList10;
+    fileDataList10 << fileData1;
+
+    QTest::newRow("Mode change + rename") << patch << fileDataList10;
+
     //////////////
 
     // Subversion New
diff --git a/src/plugins/diffeditor/diffutils.cpp b/src/plugins/diffeditor/diffutils.cpp
index 9db8a09bc4c..27ee1d3b484 100644
--- a/src/plugins/diffeditor/diffutils.cpp
+++ b/src/plugins/diffeditor/diffutils.cpp
@@ -997,12 +997,15 @@ static QList<FileData> readDiffPatch(StringView patch, bool *ok, QFutureInterfac
 // The git diff patch format (CopyFile, RenameFile)
 // 0.  [some text lines to skip, e.g. show description]\n
 // 1.  diff --git a/[leftFileName] b/[rightFileName]\n
-// 2.  [dis]similarity index [0-100]%\n
+// 2a. old mode [oldFileModeNumber]\n
+//     new mode [newFileModeNumber]\n
+// 2b. <Nothing, only in case when no ChangeMode>
+// 3.  [dis]similarity index [0-100]%\n
 //     [copy / rename] from [leftFileName]\n
 //     [copy / rename] to [rightFileName]
-// 3a. <Nothing more, only when similarity index was 100%>
-// 3b. index [leftIndexSha]..[rightIndexSha] <optionally: octalNumber>
-// 4.  --- [leftFileNameOrDevNull]\n
+// 4a. <Nothing more, only when similarity index was 100%>
+// 4b. index [leftIndexSha]..[rightIndexSha] <optionally: octalNumber>
+// 5.  --- [leftFileNameOrDevNull]\n
 //     +++ [rightFileNameOrDevNull]\n
 //     <Chunks>
 
@@ -1164,10 +1167,21 @@ static bool detectFileData(StringView patch, FileData *fileData, StringView *rem
 
     } else {
         // copy / rename
-
+        StringView afterModeOrSimilarity;
         StringView afterSimilarity;
-        // (dis)similarity index [0-100]%
-        readLine(afterDiffGit, &afterSimilarity, &hasNewLine);
+        const StringView secondLine = readLine(afterDiffGit, &afterModeOrSimilarity, &hasNewLine);
+        if (secondLine.startsWith(QLatin1String("old mode "))) {
+            if (!hasNewLine)
+                return false;
+            readLine(afterModeOrSimilarity, &afterModeOrSimilarity, &hasNewLine); // new mode
+            if (!hasNewLine)
+                return false;
+            // (dis)similarity index [0-100]%
+            readLine(afterModeOrSimilarity, &afterSimilarity, &hasNewLine);
+        } else {
+            afterSimilarity = afterModeOrSimilarity;
+        }
+
         if (!hasNewLine)
             return false; // we need to have at least one more line
 
diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp
index 383f05e9c0d..99c795ae22a 100644
--- a/src/plugins/docker/dockerdevice.cpp
+++ b/src/plugins/docker/dockerdevice.cpp
@@ -148,7 +148,7 @@ void DockerDeviceProcess::interrupt()
 
 class DockerPortsGatheringMethod : public PortsGatheringMethod
 {
-    Runnable runnable(QAbstractSocket::NetworkLayerProtocol protocol) const override
+    CommandLine commandLine(QAbstractSocket::NetworkLayerProtocol protocol) const override
     {
         // We might encounter the situation that protocol is given IPv6
         // but the consumer of the free port information decides to open
@@ -161,10 +161,8 @@ class DockerPortsGatheringMethod : public PortsGatheringMethod
         Q_UNUSED(protocol)
 
         // /proc/net/tcp* covers /proc/net/tcp and /proc/net/tcp6
-        Runnable runnable;
-        runnable.command.setExecutable("sed");
-        runnable.command.setArguments("-e 's/.*: [[:xdigit:]]*:\\([[:xdigit:]]\\{4\\}\\).*/\\1/g' /proc/net/tcp*");
-        return runnable;
+        return {"sed", "-e 's/.*: [[:xdigit:]]*:\\([[:xdigit:]]\\{4\\}\\).*/\\1/g' /proc/net/tcp*",
+                CommandLine::Raw};
     }
 
     QList<Utils::Port> usedPorts(const QByteArray &output) const override
@@ -265,7 +263,7 @@ public:
 
     bool runInContainer(const CommandLine &cmd) const;
     bool runInShell(const CommandLine &cmd) const;
-    QString outputForRunInShell(const CommandLine &cmd) const;
+    QByteArray outputForRunInShell(const CommandLine &cmd) const;
 
     void updateContainerAccess();
     void updateFileSystemAccess();
@@ -825,8 +823,8 @@ static QString getLocalIPv4Address()
 
 void DockerDevicePrivate::startContainer()
 {
-    const QString display = HostOsInfo::isWindowsHost() ? QString(getLocalIPv4Address() + ":0.0")
-                                                        : QString(":0");
+    const QString display = HostOsInfo::isLinuxHost() ? QString(":0")
+                                                      : QString(getLocalIPv4Address() + ":0.0");
     CommandLine dockerCreate{"docker", {"create",
                                         "-i",
                                         "--rm",
@@ -1320,7 +1318,7 @@ QDateTime DockerDevice::lastModified(const FilePath &filePath) const
         return res;
     }
 
-    const QString output = d->outputForRunInShell({"stat", {"-c", "%Y", filePath.path()}});
+    const QByteArray output = d->outputForRunInShell({"stat", {"-c", "%Y", filePath.path()}});
     qint64 secs = output.toLongLong();
     const QDateTime dt = QDateTime::fromSecsSinceEpoch(secs, Qt::UTC);
     return dt;
@@ -1339,8 +1337,9 @@ FilePath DockerDevice::symLinkTarget(const FilePath &filePath) const
         return mapToGlobalPath(target);
     }
 
-    const QString output = d->outputForRunInShell({"readlink", {"-n", "-e", filePath.path()}});
-    return output.isEmpty() ? FilePath() : filePath.withNewPath(output);
+    const QByteArray output = d->outputForRunInShell({"readlink", {"-n", "-e", filePath.path()}});
+    const QString out = QString::fromUtf8(output.data(), output.size());
+    return out.isEmpty() ? FilePath() : filePath.withNewPath(out);
 }
 
 qint64 DockerDevice::fileSize(const FilePath &filePath) const
@@ -1353,7 +1352,7 @@ qint64 DockerDevice::fileSize(const FilePath &filePath) const
         return localAccess.fileSize();
     }
 
-    const QString output = d->outputForRunInShell({"stat", {"-c", "%s", filePath.path()}});
+    const QByteArray output = d->outputForRunInShell({"stat", {"-c", "%s", filePath.path()}});
     return output.toLongLong();
 }
 
@@ -1367,7 +1366,7 @@ QFileDevice::Permissions DockerDevice::permissions(const FilePath &filePath) con
         return localAccess.permissions();
     }
 
-    const QString output = d->outputForRunInShell({"stat", {"-c", "%a", filePath.path()}});
+    const QByteArray output = d->outputForRunInShell({"stat", {"-c", "%a", filePath.path()}});
     const uint bits = output.toUInt(nullptr, 8);
     QFileDevice::Permissions perm = {};
 #define BIT(n, p) if (bits & (1<<n)) perm |= QFileDevice::p
@@ -1456,14 +1455,15 @@ void DockerDevice::iterateWithFind(const FilePath &filePath,
         }
     }
     arguments << filterOptions;
-    const QString output = d->outputForRunInShell({"find", arguments});
-    if (!output.isEmpty() && !output.startsWith(filePath.path())) { // missing find, unknown option
-        LOG("Setting 'do not use find'" << output.left(output.indexOf('\n')));
+    const QByteArray output = d->outputForRunInShell({"find", arguments});
+    const QString out = QString::fromUtf8(output.data(), output.size());
+    if (!output.isEmpty() && !out.startsWith(filePath.path())) { // missing find, unknown option
+        LOG("Setting 'do not use find'" << out.left(out.indexOf('\n')));
         d->m_useFind = false;
         return;
     }
 
-    const QStringList entries = output.split("\n", Qt::SkipEmptyParts);
+    const QStringList entries = out.split("\n", Qt::SkipEmptyParts);
     for (const QString &entry : entries) {
         if (entry.startsWith("find: "))
             continue;
@@ -1533,8 +1533,9 @@ void DockerDevice::iterateDirectory(const FilePath &filePath,
     }
 
     // if we do not have find - use ls as fallback
-    const QString output = d->outputForRunInShell({"ls", {"-1", "-b", "--", filePath.path()}});
-    const QStringList entries = output.split('\n', Qt::SkipEmptyParts);
+    const QByteArray output = d->outputForRunInShell({"ls", {"-1", "-b", "--", filePath.path()}});
+    const QString out = QString::fromUtf8(output.data(), output.size());
+    const QStringList entries = out.split('\n', Qt::SkipEmptyParts);
     filterEntriesHelper(filePath, callBack, entries, filter);
 }
 
@@ -1654,8 +1655,9 @@ void DockerDevice::aboutToBeRemoved() const
 void DockerDevicePrivate::fetchSystemEnviroment()
 {
     if (m_shell) {
-        const QString remoteOutput = outputForRunInShell({"env", {}});
-        m_cachedEnviroment = Environment(remoteOutput.split('\n', Qt::SkipEmptyParts), q->osType());
+        const QByteArray output = outputForRunInShell({"env", {}});
+        const QString out = QString::fromUtf8(output.data(), output.size());
+        m_cachedEnviroment = Environment(out.split('\n', Qt::SkipEmptyParts), q->osType());
         return;
     }
 
@@ -1717,7 +1719,7 @@ static QByteArray randomHex()
     return QString::number(val, 16).toUtf8();
 }
 
-QString DockerDevicePrivate::outputForRunInShell(const CommandLine &cmd) const
+QByteArray DockerDevicePrivate::outputForRunInShell(const CommandLine &cmd) const
 {
     if (!DockerPlugin::isDaemonRunning().value_or(false))
         return {};
@@ -1735,7 +1737,7 @@ QString DockerDevicePrivate::outputForRunInShell(const CommandLine &cmd) const
     LOG("Run command in shell:" << cmd.toUserOutput() << "output size:" << output.size());
     if (QTC_GUARD(output.endsWith(markerWithNewLine)))
         output.chop(markerWithNewLine.size());
-    return QString::fromUtf8(output);
+    return output;
 }
 
 // Factory
@@ -1890,7 +1892,6 @@ DockerDeviceFactory::DockerDeviceFactory()
 {
     setDisplayName(DockerDevice::tr("Docker Device"));
     setIcon(QIcon());
-    setCanCreate(true);
     setCreator([] {
         DockerDeviceSetupWizard wizard;
         if (wizard.exec() != QDialog::Accepted)
diff --git a/src/plugins/fakevim/fakevim_test.cpp b/src/plugins/fakevim/fakevim_test.cpp
index f8b37bd8149..07ab92c1911 100644
--- a/src/plugins/fakevim/fakevim_test.cpp
+++ b/src/plugins/fakevim/fakevim_test.cpp
@@ -3029,6 +3029,50 @@ void FakeVimPlugin::test_vim_substitute()
     COMMAND("undo | s/\\(b...E\\)/\\U\\1/g", "aBC DEfGh");
     COMMAND("undo | s/\\(C..E\\)/\\l\\1/g",  "abc dEfGh");
     COMMAND("undo | s/\\(b...E\\)/\\L\\1/g", "abc defGh");
+
+    // replace 1 backslash with 1 forward slash (separator: /)
+    data.setText(R"(abc\def)");
+    COMMAND(R"(s/\\/\/)", X "abc/def");
+
+    // replace 1 backslash with X  normal on line (separator: /)
+    data.setText(R"(abc\def\ghi)");
+    COMMAND(R"(s/\\/X/g)", X "abcXdefXghi");
+
+    // replace 1 backslash with 1 forward slash on line (separator: /)
+    data.setText(R"(abc\def\ghi)");
+    COMMAND(R"(s/\\/\//g)", X "abc/def/ghi");
+
+    // replace 1 backslash with 1 forward slash
+    data.setText(R"(abc\def)");
+    COMMAND(R"(s#\\#/)", X "abc/def");
+
+    // replace 1 backslash with 1 forward slash on line
+    data.setText(R"(abc\def\ghi)");
+    COMMAND(R"(s#\\#/#g)", X "abc/def/ghi");
+
+    // replace 2 backslash with 2 forward slash
+    data.setText(R"(abc\\def)");
+    COMMAND(R"(s#\\\\#//)", X "abc//def");
+
+    // replace 2 backslash with 2 forward slash on line
+    data.setText(R"(abc\\def\\ghi)");
+    COMMAND(R"(s#\\\\#//#g)", X "abc//def//ghi");
+
+    // replace 1 backslash with 1 forward slash last char
+    data.setText(R"(abc\)");
+    COMMAND(R"(s#\\#/)", X "abc/");
+
+    // replace 1 backslash with 1 forward slash first char
+    data.setText(R"(\abc)");
+    COMMAND(R"(s#\\#/)", X "/abc");
+
+    // replace 1 # with 2 #  on line
+    data.setText(R"(abc#def#ghi)");
+    COMMAND(R"(s#\##\#\##g)", X "abc##def##ghi");
+
+    // replace 2 # with 4 # on line
+    data.setText(R"(abc##def##ghi)");
+    COMMAND(R"(s#\#\##\#\#\#\##g)", X "abc####def####ghi");
 }
 
 void FakeVimPlugin::test_vim_ex_commandbuffer_paste()
diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
index aa8b74a00e3..79e8153c01b 100644
--- a/src/plugins/fakevim/fakevimhandler.cpp
+++ b/src/plugins/fakevim/fakevimhandler.cpp
@@ -816,9 +816,18 @@ static bool substituteText(QString *text,
 
 static int findUnescaped(QChar c, const QString &line, int from)
 {
+    bool singleBackSlashBefore = false;
     for (int i = from; i < line.size(); ++i) {
-        if (line.at(i) == c && (i == 0 || line.at(i - 1) != '\\'))
+        const QChar currentChar = line.at(i);
+        if (currentChar == '\\') {
+           singleBackSlashBefore = !singleBackSlashBefore;
+           continue;
+        }
+
+        if (currentChar == c && !singleBackSlashBefore)
             return i;
+
+        singleBackSlashBefore = false;
     }
     return -1;
 }
diff --git a/src/plugins/git/branchview.cpp b/src/plugins/git/branchview.cpp
index ffc346d71ca..eed65d20aa5 100644
--- a/src/plugins/git/branchview.cpp
+++ b/src/plugins/git/branchview.cpp
@@ -76,6 +76,18 @@ protected:
     }
 };
 
+struct SetInContext
+{
+    SetInContext(bool &block) : m_block(block)
+    {
+        m_origValue = m_block;
+        m_block = true;
+    }
+    ~SetInContext() { m_block = m_origValue; }
+    bool &m_block;
+    bool m_origValue;
+};
+
 BranchView::BranchView()
     : m_includeOldEntriesAction(new QAction(tr("Include Old Entries"), this))
     , m_includeTagsAction(new QAction(tr("Include Tags"), this))
@@ -148,7 +160,7 @@ void BranchView::refreshIfSame(const FilePath &repository)
 
 void BranchView::refresh(const FilePath &repository, bool force)
 {
-    if (m_repository == repository && !force)
+    if (m_blockRefresh || (m_repository == repository && !force))
         return;
 
     m_repository = repository;
@@ -261,8 +273,10 @@ void BranchView::slotCustomContextMenu(const QPoint &point)
         contextMenu.addSeparator();
         contextMenu.addAction(tr("&Diff"), this, [this] {
             const QString fullName = m_model->fullName(selectedIndex(), true);
-            if (!fullName.isEmpty())
+            if (!fullName.isEmpty()) {
+                SetInContext block(m_blockRefresh);
                 GitClient::instance()->diffBranch(m_repository, fullName);
+            }
         });
         contextMenu.addAction(tr("&Log"), this, [this] { log(selectedIndex()); });
         contextMenu.addAction(tr("Reflo&g"), this, [this] { reflog(selectedIndex()); });
@@ -582,15 +596,19 @@ bool BranchView::cherryPick()
 void BranchView::log(const QModelIndex &idx)
 {
     const QString branchName = m_model->fullName(idx, true);
-    if (!branchName.isEmpty())
-        GitClient::instance()->log(m_repository, QString(), false, {branchName});
+    if (branchName.isEmpty())
+        return;
+    SetInContext block(m_blockRefresh);
+    GitClient::instance()->log(m_repository, QString(), false, {branchName});
 }
 
 void BranchView::reflog(const QModelIndex &idx)
 {
     const QString branchName = m_model->fullName(idx, true);
-    if (!branchName.isEmpty())
-        GitClient::instance()->reflog(m_repository, branchName);
+    if (branchName.isEmpty())
+        return;
+    SetInContext block(m_blockRefresh);
+    GitClient::instance()->reflog(m_repository, branchName);
 }
 
 void BranchView::push()
diff --git a/src/plugins/git/branchview.h b/src/plugins/git/branchview.h
index 9d46f52e6e1..a11379f8e6e 100644
--- a/src/plugins/git/branchview.h
+++ b/src/plugins/git/branchview.h
@@ -97,6 +97,7 @@ private:
     BranchModel *m_model = nullptr;
     BranchFilterModel *m_filterModel = nullptr;
     Utils::FilePath m_repository;
+    bool m_blockRefresh = false;
 };
 
 class BranchViewFactory : public Core::INavigationWidgetFactory
diff --git a/src/plugins/git/mergetool.cpp b/src/plugins/git/mergetool.cpp
index c84273f438a..b1da451b6b0 100644
--- a/src/plugins/git/mergetool.cpp
+++ b/src/plugins/git/mergetool.cpp
@@ -211,7 +211,10 @@ void MergeTool::readData()
     VcsOutputWindow::append(newData);
     QString data = m_unfinishedLine + newData;
     m_unfinishedLine.clear();
-    while (const int index = data.indexOf('\n') != -1) {
+    for (;;) {
+        const int index = data.indexOf('\n');
+        if (index == -1)
+            break;
         const QString line = data.left(index + 1);
         readLine(line);
         data = data.mid(index + 1);
diff --git a/src/plugins/mcusupport/mcusupportdevice.cpp b/src/plugins/mcusupport/mcusupportdevice.cpp
index 7ff559ea70a..b1198303771 100644
--- a/src/plugins/mcusupport/mcusupportdevice.cpp
+++ b/src/plugins/mcusupport/mcusupportdevice.cpp
@@ -60,7 +60,6 @@ McuSupportDeviceFactory::McuSupportDeviceFactory()
     setCombinedIcon(":/mcusupport/images/mcusupportdevicesmall.png",
                     ":/mcusupport/images/mcusupportdevice.png");
     setConstructionFunction(&McuSupportDevice::create);
-    setCanCreate(true);
     setCreator(&McuSupportDevice::create);
 }
 
diff --git a/src/plugins/projectexplorer/applicationlauncher.cpp b/src/plugins/projectexplorer/applicationlauncher.cpp
index b3dfc5a2161..ea9dbd4a059 100644
--- a/src/plugins/projectexplorer/applicationlauncher.cpp
+++ b/src/plugins/projectexplorer/applicationlauncher.cpp
@@ -381,13 +381,7 @@ void ApplicationLauncherPrivate::start(const Runnable &runnable, const IDevice::
             cmdLine = disclaim;
         }
 
-        if (m_runAsRoot) {
-            CommandLine wrapped("sudo", {"-A"});
-            wrapped.addCommandLineAsArgs(cmdLine);
-            cmdLine = wrapped;
-        }
-        // TODO: QtcProcess::setRunAsRoot() doens't work as expected currently
-        // m_localProcess->setRunAsRoot(m_runAsRoot);
+        m_localProcess->setRunAsRoot(m_runAsRoot);
         m_localProcess->setCommand(cmdLine);
         m_localProcess->start();
     } else {
diff --git a/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp b/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp
index 33969239f76..87efde505e9 100644
--- a/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp
+++ b/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp
@@ -125,7 +125,7 @@ DeviceEnvironmentFetcher::Ptr DesktopDevice::environmentFetcher() const
 
 class DesktopPortsGatheringMethod : public PortsGatheringMethod
 {
-    Runnable runnable(QAbstractSocket::NetworkLayerProtocol protocol) const override
+    CommandLine commandLine(QAbstractSocket::NetworkLayerProtocol protocol) const override
     {
         // We might encounter the situation that protocol is given IPv6
         // but the consumer of the free port information decides to open
@@ -137,12 +137,11 @@ class DesktopPortsGatheringMethod : public PortsGatheringMethod
 
         Q_UNUSED(protocol)
 
-        Runnable runnable;
         if (HostOsInfo::isWindowsHost() || HostOsInfo::isMacHost())
-            runnable.command = CommandLine{"netstat", {"-a", "-n"}};
-        else if (HostOsInfo::isLinuxHost())
-            runnable.command = CommandLine{"/bin/sh", {"-c", "cat /proc/net/tcp*"}};
-        return runnable;
+            return {"netstat", {"-a", "-n"}};
+        if (HostOsInfo::isLinuxHost())
+            return {"/bin/sh", {"-c", "cat /proc/net/tcp*"}};
+        return {};
     }
 
     QList<Utils::Port> usedPorts(const QByteArray &output) const override
diff --git a/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp b/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp
index d2d3961a015..567cf5d41f5 100644
--- a/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp
+++ b/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp
@@ -86,7 +86,8 @@ void DeviceUsedPortsGatherer::start(const IDevice::ConstPtr &device)
     connect(d->process.data(), &DeviceProcess::readyReadStandardError,
             this, &DeviceUsedPortsGatherer::handleRemoteStdErr);
 
-    const Runnable runnable = d->portsGatheringMethod->runnable(protocol);
+    Runnable runnable;
+    runnable.command = d->portsGatheringMethod->commandLine(protocol);
     d->process->start(runnable);
 }
 
diff --git a/src/plugins/projectexplorer/devicesupport/idevice.h b/src/plugins/projectexplorer/devicesupport/idevice.h
index 144daffbfda..8e395368a8c 100644
--- a/src/plugins/projectexplorer/devicesupport/idevice.h
+++ b/src/plugins/projectexplorer/devicesupport/idevice.h
@@ -63,7 +63,6 @@ class Connection;
 class DeviceProcess;
 class DeviceProcessList;
 class Kit;
-class Runnable;
 class Task;
 
 namespace Internal { class IDevicePrivate; }
@@ -116,7 +115,7 @@ public:
     using Ptr = QSharedPointer<const PortsGatheringMethod>;
 
     virtual ~PortsGatheringMethod() = default;
-    virtual Runnable runnable(QAbstractSocket::NetworkLayerProtocol protocol) const = 0;
+    virtual Utils::CommandLine commandLine(QAbstractSocket::NetworkLayerProtocol protocol) const = 0;
     virtual QList<Utils::Port> usedPorts(const QByteArray &commandOutput) const = 0;
 };
 
diff --git a/src/plugins/projectexplorer/devicesupport/idevicefactory.cpp b/src/plugins/projectexplorer/devicesupport/idevicefactory.cpp
index c286a97f9e3..1ff8498d3eb 100644
--- a/src/plugins/projectexplorer/devicesupport/idevicefactory.cpp
+++ b/src/plugins/projectexplorer/devicesupport/idevicefactory.cpp
@@ -27,6 +27,7 @@
 
 #include <utils/algorithm.h>
 #include <utils/icon.h>
+#include <utils/qtcassert.h>
 
 using namespace Utils;
 
@@ -78,7 +79,7 @@ namespace ProjectExplorer {
 
 bool IDeviceFactory::canCreate() const
 {
-    return m_canCreate;
+    return bool(m_creator);
 }
 
 IDevice::Ptr IDeviceFactory::create() const
@@ -119,13 +120,9 @@ void IDeviceFactory::setCombinedIcon(const FilePath &small, const FilePath &larg
                                  Icon({{large, Theme::IconsBaseColor}})});
 }
 
-void IDeviceFactory::setCanCreate(bool canCreate)
-{
-    m_canCreate = canCreate;
-}
-
 void IDeviceFactory::setCreator(const std::function<IDevice::Ptr ()> &creator)
 {
+    QTC_ASSERT(creator, return);
     m_creator = creator;
 }
 
diff --git a/src/plugins/projectexplorer/devicesupport/idevicefactory.h b/src/plugins/projectexplorer/devicesupport/idevicefactory.h
index 2d44ebf162f..59034aaef5f 100644
--- a/src/plugins/projectexplorer/devicesupport/idevicefactory.h
+++ b/src/plugins/projectexplorer/devicesupport/idevicefactory.h
@@ -58,7 +58,6 @@ protected:
     void setDisplayName(const QString &displayName);
     void setIcon(const QIcon &icon);
     void setCombinedIcon(const Utils::FilePath &small, const Utils::FilePath &large);
-    void setCanCreate(bool canCreate);
     void setConstructionFunction(const std::function<IDevice::Ptr ()> &constructor);
     void setCreator(const std::function<IDevice::Ptr()> &creator);
 
@@ -67,7 +66,6 @@ private:
     const Utils::Id m_deviceType;
     QString m_displayName;
     QIcon m_icon;
-    bool m_canCreate = false;
     std::function<IDevice::Ptr()> m_constructor;
 };
 
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp
index 061636cf427..e4f4098c5ff 100644
--- a/src/plugins/projectexplorer/gcctoolchain.cpp
+++ b/src/plugins/projectexplorer/gcctoolchain.cpp
@@ -1277,7 +1277,7 @@ public:
         m_overrideCheckBox.setText(tr("Override for code model"));
         m_overrideCheckBox.setToolTip(tr("Check this button in the rare case that the code model\n"
                 "fails because clang does not understand the target architecture."));
-        layout->addWidget(&m_tripleLineEdit);
+        layout->addWidget(&m_tripleLineEdit, 1);
         layout->addWidget(&m_overrideCheckBox);
         layout->addStretch(1);
 
diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp
index a64783d5c3d..52cf506a885 100644
--- a/src/plugins/projectexplorer/kitmanager.cpp
+++ b/src/plugins/projectexplorer/kitmanager.cpp
@@ -755,6 +755,9 @@ void KitAspectWidget::addToLayoutWithLabel(QWidget *parent)
     QTC_ASSERT(parent, return);
     auto label = createSubWidget<QLabel>(m_kitInformation->displayName() + ':');
     label->setToolTip(m_kitInformation->description());
+    connect(label, &QLabel::linkActivated, this, [this](const QString &link) {
+        emit labelLinkActivated(link);
+    });
 
     LayoutExtender builder(parent->layout());
     builder.finishRow();
diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp
index b283862c467..9ffd402d3ed 100644
--- a/src/plugins/projectexplorer/project.cpp
+++ b/src/plugins/projectexplorer/project.cpp
@@ -1078,6 +1078,11 @@ bool Project::isModified() const
     return !modifiedDocuments().isEmpty();
 }
 
+bool Project::isEditModePreferred() const
+{
+    return true;
+}
+
 #if defined(WITH_TESTS)
 
 static FilePath constructTestPath(const char *basePath)
diff --git a/src/plugins/projectexplorer/project.h b/src/plugins/projectexplorer/project.h
index ab9b55cd47d..22495aa47a1 100644
--- a/src/plugins/projectexplorer/project.h
+++ b/src/plugins/projectexplorer/project.h
@@ -183,6 +183,8 @@ public:
     QList<Core::IDocument *> modifiedDocuments() const;
     bool isModified() const;
 
+    virtual bool isEditModePreferred() const;
+
 signals:
     void projectFileIsDirty(const Utils::FilePath &path);
 
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index f869a9d3cd4..692efcb988b 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -2512,12 +2512,13 @@ ProjectExplorerPlugin::OpenProjectResult ProjectExplorerPlugin::openProjects(con
     }
     dd->updateActions();
 
-    bool switchToProjectsMode = Utils::anyOf(openedPro, &Project::needsConfiguration);
-
+    const bool switchToProjectsMode = Utils::anyOf(openedPro, &Project::needsConfiguration);
+    const bool switchToEditMode = Utils::allOf(openedPro,
+                                               [](Project *p) { return p->isEditModePreferred(); });
     if (!openedPro.isEmpty()) {
         if (switchToProjectsMode)
             ModeManager::activateMode(Constants::MODE_SESSION);
-        else
+        else if (switchToEditMode)
             ModeManager::activateMode(Core::Constants::MODE_EDIT);
         ModeManager::setFocusToCurrentMode();
     }
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetsmodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetsmodel.cpp
index a04ff0f48f4..c7c8db45342 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetsmodel.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetsmodel.cpp
@@ -135,6 +135,18 @@ void ItemLibraryAssetsModel::deleteFile(const QString &filePath)
     }
 }
 
+bool ItemLibraryAssetsModel::renameFolder(const QString &folderPath, const QString &newName)
+{
+    QDir dir{folderPath};
+    QString oldName = dir.dirName();
+
+    if (oldName == newName)
+        return true;
+
+    dir.cdUp();
+    return dir.rename(oldName, newName);
+}
+
 void ItemLibraryAssetsModel::addNewFolder(const QString &folderPath)
 {
     QString iterPath = folderPath;
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetsmodel.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetsmodel.h
index e429605b9a6..989f9f7226f 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetsmodel.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetsmodel.h
@@ -84,6 +84,7 @@ public:
     Q_INVOKABLE void toggleExpandAll(bool expand);
     Q_INVOKABLE DirExpandState getAllExpandedState() const;
     Q_INVOKABLE void deleteFile(const QString &filePath);
+    Q_INVOKABLE bool renameFolder(const QString &folderPath, const QString &newName);
     Q_INVOKABLE void addNewFolder(const QString &folderPath);
     Q_INVOKABLE void deleteFolder(const QString &folderPath);
     Q_INVOKABLE QObject *rootDir() const;
diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
index ffdd105d39b..7e7b650da82 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
@@ -304,24 +304,28 @@ Qt::ItemFlags NavigatorTreeModel::flags(const QModelIndex &index) const
 
 void static appendForcedNodes(const NodeListProperty &property, QList<ModelNode> &list)
 {
-    const QStringList visibleProperties = NodeHints::fromModelNode(property.parentModelNode()).visibleNonDefaultProperties();
+    const QSet<ModelNode> set = QSet<ModelNode>(list.constBegin(), list.constEnd());
     for (const ModelNode &node : property.parentModelNode().directSubModelNodes()) {
-        if (!list.contains(node) && visibleProperties.contains(QString::fromUtf8(node.parentProperty().name())))
-            list.append(node);
+        if (!set.contains(node)) {
+            const QStringList visibleProperties = NodeHints::fromModelNode(property.parentModelNode()).visibleNonDefaultProperties();
+            if (visibleProperties.contains(QString::fromUtf8(node.parentProperty().name())))
+                list.append(node);
+        }
     }
 }
 
-QList<ModelNode> filteredList(const NodeListProperty &property, bool filter, bool reverseOrder)
+QList<ModelNode> NavigatorTreeModel::filteredList(const NodeListProperty &property, bool filter, bool reverseOrder) const
 {
+    auto it = m_rowCache.find(property.parentModelNode());
+
+    if (it != m_rowCache.end())
+        return it.value();
+
     QList<ModelNode> list;
 
     if (filter) {
         list.append(Utils::filtered(property.toModelNodeList(), [] (const ModelNode &arg) {
-            const char auxProp[] = "showInNavigator@Internal";
-            if (arg.hasAuxiliaryData(auxProp))
-                return arg.auxiliaryData(auxProp).toBool();
             const bool value = QmlItemNode::isValidQmlItemNode(arg) || NodeHints::fromModelNode(arg).visibleInNavigator();
-            arg.setAuxiliaryDataWithoutLock(auxProp, value);
             return value;
         }));
     } else {
@@ -333,6 +337,7 @@ QList<ModelNode> filteredList(const NodeListProperty &property, bool filter, boo
     if (reverseOrder)
         std::reverse(list.begin(), list.end());
 
+    m_rowCache.insert(property.parentModelNode(), list);
     return list;
 }
 
@@ -1137,6 +1142,7 @@ QList<QPersistentModelIndex> NavigatorTreeModel::nodesToPersistentIndex(const QL
 
 void NavigatorTreeModel::notifyModelNodesRemoved(const QList<ModelNode> &modelNodes)
 {
+    m_rowCache.clear();
     QList<QPersistentModelIndex> indexes = nodesToPersistentIndex(collectParents(modelNodes));
     emit layoutAboutToBeChanged(indexes);
     emit layoutChanged(indexes);
@@ -1144,6 +1150,7 @@ void NavigatorTreeModel::notifyModelNodesRemoved(const QList<ModelNode> &modelNo
 
 void NavigatorTreeModel::notifyModelNodesInserted(const QList<ModelNode> &modelNodes)
 {
+    m_rowCache.clear();
     QList<QPersistentModelIndex> indexes = nodesToPersistentIndex(collectParents(modelNodes));
     emit layoutAboutToBeChanged(indexes);
     emit layoutChanged(indexes);
@@ -1151,6 +1158,7 @@ void NavigatorTreeModel::notifyModelNodesInserted(const QList<ModelNode> &modelN
 
 void NavigatorTreeModel::notifyModelNodesMoved(const QList<ModelNode> &modelNodes)
 {
+    m_rowCache.clear();
     QList<QPersistentModelIndex> indexes = nodesToPersistentIndex(collectParents(modelNodes));
     emit layoutAboutToBeChanged(indexes);
     emit layoutChanged(indexes);
@@ -1164,18 +1172,21 @@ void NavigatorTreeModel::notifyIconsChanged()
 void NavigatorTreeModel::setFilter(bool showOnlyVisibleItems)
 {
     m_showOnlyVisibleItems = showOnlyVisibleItems;
+    m_rowCache.clear();
     resetModel();
 }
 
 void NavigatorTreeModel::setOrder(bool reverseItemOrder)
 {
     m_reverseItemOrder = reverseItemOrder;
+    m_rowCache.clear();
     resetModel();
 }
 
 void NavigatorTreeModel::resetModel()
 {
     beginResetModel();
+    m_rowCache.clear();
     m_nodeIndexHash.clear();
     endResetModel();
 }
diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.h b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.h
index cb2d9451b42..ab7cd60b931 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.h
+++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.h
@@ -129,9 +129,11 @@ private:
     ModelNode createTextureNode(const NodeAbstractProperty &targetProp, const QString &imagePath);
     QList<QPersistentModelIndex> nodesToPersistentIndex(const QList<ModelNode> &modelNodes);
     void addImport(const QString &importName);
+    QList<ModelNode> filteredList(const NodeListProperty &property, bool filter, bool reverseOrder) const;
 
     QPointer<NavigatorView> m_view;
     mutable QHash<ModelNode, QModelIndex> m_nodeIndexHash;
+    mutable QHash<ModelNode, QList<ModelNode> > m_rowCache;
     bool m_showOnlyVisibleItems = true;
     bool m_reverseItemOrder = false;
     DesignerActionManager *m_actionManager = nullptr;
diff --git a/src/plugins/qmldesigner/designercore/include/nodehints.h b/src/plugins/qmldesigner/designercore/include/nodehints.h
index 16fe18320cd..581dfd48220 100644
--- a/src/plugins/qmldesigner/designercore/include/nodehints.h
+++ b/src/plugins/qmldesigner/designercore/include/nodehints.h
@@ -72,6 +72,7 @@ public:
     bool visibleInLibrary() const;
     QString forceNonDefaultProperty() const;
     QPair<QString, QVariant> setParentProperty() const;
+    QString bindParentToProperty() const;
 
     QHash<QString, QString> hints() const;
     static NodeHints fromModelNode(const ModelNode &modelNode);
diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodehints.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodehints.cpp
index 84cc5650747..099dc8ee903 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/nodehints.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/nodehints.cpp
@@ -295,6 +295,16 @@ QPair<QString, QVariant> NodeHints::setParentProperty() const
     return qMakePair(list.first().trimmed(), parseValue(list.last().trimmed()));
 }
 
+QString NodeHints::bindParentToProperty() const
+{
+    const QString expression = m_hints.value("bindParentToProperty");
+
+    if (expression.isEmpty())
+        return {};
+
+    return Internal::evaluateExpression(expression, modelNode(), ModelNode()).toString();
+}
+
 QHash<QString, QString> NodeHints::hints() const
 {
     return m_hints;
diff --git a/src/plugins/qmldesigner/designercore/model/qmlvisualnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlvisualnode.cpp
index a580ee55495..6a78e11cdba 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlvisualnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlvisualnode.cpp
@@ -301,7 +301,7 @@ QmlObjectNode QmlVisualNode::createQmlObjectNode(AbstractView *view,
             for (const auto &property : itemLibraryEntry.properties()) {
                 if (property.type() == "binding") {
                     propertyBindingList.append(PropertyBindingEntry(property.name(), property.value().toString()));
-                } else if (property.type() == "enum")  {
+                } else if (property.type() == "enum") {
                     propertyEnumList.append(PropertyBindingEntry(property.name(), property.value().toString()));
                 } else if (property.value().toString() == QString::fromLatin1(imagePlaceHolder)) {
                     propertyPairList.append({property.name(), imagePlaceHolderPath(view->model()) });
@@ -361,6 +361,15 @@ QmlObjectNode QmlVisualNode::createQmlObjectNode(AbstractView *view,
         parent.variantProperty(property).setValue(value);
     }
 
+    if (!hints.bindParentToProperty().isEmpty() && parentProperty.isValid()) {
+        const PropertyName property = hints.bindParentToProperty().toUtf8();
+        ModelNode parent = parentProperty.parentModelNode();
+
+        const NodeMetaInfo metaInfo = newQmlObjectNode.modelNode().metaInfo();
+        if (metaInfo.hasProperty(property))
+            newQmlObjectNode.setBindingProperty(property, parent.validId());
+    }
+
     return newQmlObjectNode;
 }
 
diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp
index 6f218943750..584933494b5 100644
--- a/src/plugins/qmldesigner/designmodewidget.cpp
+++ b/src/plugins/qmldesigner/designmodewidget.cpp
@@ -377,7 +377,7 @@ void DesignModeWidget::setup()
         auto outputPanePlaceholder = new Core::OutputPanePlaceHolder(Core::Constants::MODE_DESIGN);
         m_outputPaneDockWidget = new ADS::DockWidget(uniqueId);
         m_outputPaneDockWidget->setWidget(outputPanePlaceholder);
-        m_outputPaneDockWidget->setWindowTitle("Output Pane");
+        m_outputPaneDockWidget->setWindowTitle(tr("Output Pane"));
         m_dockManager->addDockWidget(ADS::NoDockWidgetArea, m_outputPaneDockWidget);
 
         // Set unique id as object name
@@ -497,7 +497,7 @@ void DesignModeWidget::aboutToShowWorkspaces()
         m_dockManager->openWorkspace(workspace);
     });
 
-    QAction *action = menu->addAction("Manage...");
+    QAction *action = menu->addAction(tr("Manage..."));
     connect(action, &QAction::triggered,
             m_dockManager, &ADS::DockManager::showWorkspaceMananger);
 
diff --git a/src/plugins/qmldesigner/studioplugin/studioplugin.cpp b/src/plugins/qmldesigner/studioplugin/studioplugin.cpp
index d31c1d88f59..6d3f7b8e8b4 100644
--- a/src/plugins/qmldesigner/studioplugin/studioplugin.cpp
+++ b/src/plugins/qmldesigner/studioplugin/studioplugin.cpp
@@ -18,31 +18,10 @@
 
 #include "studioplugin.h"
 
-#include <modelnodecontextmenu_helper.h>
-#include <componentcore_constants.h>
-#include <qmldesignerplugin.h>
-#include <viewmanager.h>
-
-#include <extensionsystem/pluginmanager.h>
-#include <extensionsystem/pluginspec.h>
-#include <coreplugin/icore.h>
-
-#include <utils/qtcassert.h>
-#include <utils/utilsicons.h>
-
-#include <projectexplorer/jsonwizard/jsonwizardfactory.h>
-#include <projectexplorer/runconfiguration.h>
-
-#include <QtPlugin>
-
 namespace QmlDesigner {
 
-using namespace ProjectExplorer;
-
 StudioPlugin::StudioPlugin()
 {
-    JsonWizardFactory::clearWizardPaths();
-    JsonWizardFactory::addWizardPath(Core::ICore::resourcePath("qmldesigner/studio_templates"));
 }
 
 QString StudioPlugin::pluginName() const
diff --git a/src/plugins/qmldesigner/studioplugin/studioplugin.metainfo b/src/plugins/qmldesigner/studioplugin/studioplugin.metainfo
index d80aa0cd3fe..5468269e83c 100644
--- a/src/plugins/qmldesigner/studioplugin/studioplugin.metainfo
+++ b/src/plugins/qmldesigner/studioplugin/studioplugin.metainfo
@@ -1,4 +1,18 @@
 MetaInfo {
+    Type {
+        name: "QtStudio3D.Studio3D"
+        icon: ":/qtquickplugin/images/item-icon16.png"
+
+        ItemLibraryEntry {
+            name: "Studio 3D"
+            category: "Qt 3D Studio"
+            libraryIcon: ":/qtquickplugin/images/item-icon.png"
+            version: "2.0"
+            requiredImport: "QtStudio3D"
+
+            QmlSource { source: ":/studioplugin/data/qt3ditem.qml" }
+        }
+    }
 
     Imports {
         blacklistImports: [
@@ -15,7 +29,18 @@ MetaInfo {
         "QtTest",
         "QtWebEngine",
         "QtWebSockets",
-        "QtQuick.Dialogs."
+        "QtQuick.Dialogs.",
+        "QtSensors",
+        "QtRemoveObjects",
+        "QtQuick.tooling",
+        "QtWebView",
+        "QtCore",
+        "QtQuick.Controls.Basic",
+        "QtQuick.Controls.Fusion",
+        "QtQuick.Controls.Imagine",
+        "QtQuick.Controls.Universal",
+        "QtQuick.Controls.Material",
+        "QtQuick.Controls.NativeStyle"
         ]
 
     showTagsForImports: [
diff --git a/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.cpp b/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.cpp
index 0b637e24a74..710f34b445b 100644
--- a/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.cpp
+++ b/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.cpp
@@ -92,8 +92,11 @@ QmlProjectItem *QmlProjectFileFormat::parseProjectFile(const Utils::FilePath &fi
             projectItem->setMainFile(mainFileProperty.value.toString());
 
         const auto importPathsProperty = rootNode->property(QLatin1String("importPaths"));
-        if (importPathsProperty.isValid())
-            projectItem->setImportPaths(importPathsProperty.value.toStringList());
+        if (importPathsProperty.isValid()) {
+            QStringList list = importPathsProperty.value.toStringList();
+            list.removeAll(".");
+            projectItem->setImportPaths(list);
+        }
 
         const auto fileSelectorsProperty = rootNode->property(QLatin1String("fileSelectors"));
         if (fileSelectorsProperty.isValid())
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp
index e0db9f53c62..e96dadb970b 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.cpp
+++ b/src/plugins/qmlprojectmanager/qmlproject.cpp
@@ -76,13 +76,6 @@ Q_LOGGING_CATEGORY(infoLogger, "QmlProjectManager.QmlBuildSystem", QtInfoMsg)
 
 namespace QmlProjectManager {
 
-static bool isQtDesignStudio()
-{
-    QSettings *settings = Core::ICore::settings();
-    const QString qdsStandaloneEntry = "QML/Designer/StandAloneMode"; //entry from qml settings
-
-    return settings->value(qdsStandaloneEntry, false).toBool();
-}
 static int preferedQtTarget(Target *target)
 {
     if (target) {
@@ -95,6 +88,15 @@ static int preferedQtTarget(Target *target)
 
 const char openInQDSAppSetting[] = "OpenInQDSApp";
 
+Utils::FilePaths QmlProject::getUiQmlFilesForFolder(const Utils::FilePath &folder)
+{
+    const Utils::FilePaths uiFiles = files([&](const ProjectExplorer::Node *node) {
+        return node->filePath().completeSuffix() == "ui.qml"
+                && node->filePath().parentDir() == folder;
+    });
+    return uiFiles;
+}
+
 QmlProject::QmlProject(const Utils::FilePath &fileName)
     : Project(QString::fromLatin1(Constants::QMLPROJECT_MIMETYPE), fileName)
 {
@@ -105,7 +107,7 @@ QmlProject::QmlProject(const Utils::FilePath &fileName)
     setNeedsBuildConfigurations(false);
     setBuildSystemCreator([](Target *t) { return new QmlBuildSystem(t); });
 
-    if (!isQtDesignStudio()) {
+    if (!QmlProject::isQtDesignStudio()) {
         if (QmlProjectPlugin::qdsInstallationExists()) {
             auto lambda = [fileName]() {
                 if (Core::ICore::infoBar()->canInfoBeAdded(openInQDSAppSetting)) {
@@ -124,27 +126,35 @@ QmlProject::QmlProject(const Utils::FilePath &fileName)
             QTimer::singleShot(0, this, lambda);
         }
     } else {
-        m_openFileConnection = connect(
-            this, &QmlProject::anyParsingFinished, this, [this](Target *target, bool success) {
-                if (m_openFileConnection)
-                    disconnect(m_openFileConnection);
+        m_openFileConnection
+            = connect(this,
+                      &QmlProject::anyParsingFinished,
+                      this,
+                      [this](Target *target, bool success) {
+                          if (m_openFileConnection)
+                              disconnect(m_openFileConnection);
 
-                if (target && success) {
-                    const Utils::FilePath &folder = projectDirectory();
-                    const Utils::FilePaths &uiFiles = files([&](const ProjectExplorer::Node *node) {
-                        return node->filePath().completeSuffix() == "ui.qml"
-                               && node->filePath().parentDir() == folder;
-                    });
-                    if (!uiFiles.isEmpty()) {
-                        Utils::FilePath currentFile;
-                        if (auto cd = Core::EditorManager::currentDocument())
-                            currentFile = cd->filePath();
+                          if (target && success) {
+                              const Utils::FilePath &folder = projectDirectory() + "/content";
 
-                        if (currentFile.isEmpty() || !isKnownFile(currentFile))
-                            Core::EditorManager::openEditor(uiFiles.first(), Utils::Id());
-                    }
-                }
-            });
+                              Utils::FilePaths uiFiles = getUiQmlFilesForFolder(projectDirectory()
+                                                                                + "/content");
+                              if (uiFiles.isEmpty())
+                                  uiFiles = getUiQmlFilesForFolder(projectDirectory());
+
+                              if (!uiFiles.isEmpty()) {
+                                  Utils::FilePath currentFile;
+                                  if (auto cd = Core::EditorManager::currentDocument())
+                                      currentFile = cd->filePath();
+
+                                  if (currentFile.isEmpty() || !isKnownFile(currentFile))
+                                      QTimer::singleShot(1000, [uiFiles]() {
+                                          Core::EditorManager::openEditor(uiFiles.first(),
+                                                                          Utils::Id());
+                                      });
+                              }
+                          }
+                      });
     }
 }
 
@@ -446,6 +456,11 @@ Tasks QmlProject::projectIssues(const Kit *k) const
     return result;
 }
 
+bool QmlProject::isEditModePreferred() const
+{
+    return !isQtDesignStudio();
+}
+
 Project::RestoreResult QmlProject::fromMap(const QVariantMap &map, QString *errorMessage)
 {
     RestoreResult result = Project::fromMap(map, errorMessage);
@@ -467,7 +482,7 @@ Project::RestoreResult QmlProject::fromMap(const QVariantMap &map, QString *erro
                 addTargetForKit(kits.first());
         }
 
-        if (isQtDesignStudio()) {
+        if (QmlProject::isQtDesignStudio()) {
             auto setKitWithVersion = [&](int qtMajorVersion) {
                 const QList<Kit *> qtVersionkits
                     = Utils::filtered(kits, [qtMajorVersion](const Kit *k) {
@@ -494,6 +509,14 @@ Project::RestoreResult QmlProject::fromMap(const QVariantMap &map, QString *erro
     return RestoreResult::Ok;
 }
 
+bool QmlProject::isQtDesignStudio()
+{
+    QSettings *settings = Core::ICore::settings();
+    const QString qdsStandaloneEntry = "QML/Designer/StandAloneMode";
+
+    return settings->value(qdsStandaloneEntry, false).toBool();
+}
+
 ProjectExplorer::DeploymentKnowledge QmlProject::deploymentKnowledge() const
 {
     return DeploymentKnowledge::Perfect;
diff --git a/src/plugins/qmlprojectmanager/qmlproject.h b/src/plugins/qmlprojectmanager/qmlproject.h
index 89f5dd34454..a351d394c7d 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.h
+++ b/src/plugins/qmlprojectmanager/qmlproject.h
@@ -146,11 +146,17 @@ public:
 
     ProjectExplorer::Tasks projectIssues(const ProjectExplorer::Kit *k) const final;
 
+    static bool isQtDesignStudio();
+
+    bool isEditModePreferred() const override;
+
 protected:
     RestoreResult fromMap(const QVariantMap &map, QString *errorMessage) override;
 
 private:
     ProjectExplorer::DeploymentKnowledge deploymentKnowledge() const override;
+    Utils::FilePaths getUiQmlFilesForFolder(const Utils::FilePath &folder);
+
     QMetaObject::Connection m_openFileConnection;
 };
 
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
index 5636cbbf23a..f4363afe93b 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
@@ -66,14 +66,6 @@ namespace Internal {
 
 // QmlProjectRunConfiguration
 
-static bool isQtDesignStudio()
-{
-    QSettings *settings = Core::ICore::settings();
-    const QString qdsStandaloneEntry = "QML/Designer/StandAloneMode"; //entry from qml settings
-
-    return settings->value(qdsStandaloneEntry, false).toBool();
-}
-
 class QmlProjectRunConfiguration final : public RunConfiguration
 {
     Q_DECLARE_TR_FUNCTIONS(QmlProjectManager::QmlProjectRunConfiguration)
@@ -252,7 +244,7 @@ QString QmlProjectRunConfiguration::commandLineArguments() const
 
 void QmlProjectRunConfiguration::createQtVersionAspect()
 {
-    if (!isQtDesignStudio())
+    if (!QmlProject::isQtDesignStudio())
         return;
 
     m_qtversionAspect = addAspect<SelectionAspect>();
diff --git a/src/plugins/qnx/qnxdevice.cpp b/src/plugins/qnx/qnxdevice.cpp
index 4c88743f2ad..764355b1e1e 100644
--- a/src/plugins/qnx/qnxdevice.cpp
+++ b/src/plugins/qnx/qnxdevice.cpp
@@ -58,12 +58,10 @@ class QnxPortsGatheringMethod : public PortsGatheringMethod
 {
     // TODO: The command is probably needlessly complicated because the parsing method
     // used to be fixed. These two can now be matched to each other.
-    Runnable runnable(QAbstractSocket::NetworkLayerProtocol protocol) const override
+    CommandLine commandLine(QAbstractSocket::NetworkLayerProtocol protocol) const override
     {
         Q_UNUSED(protocol)
-        Runnable runnable;
-        runnable.command = {"netstat", {"-na"}};
-        return runnable;
+        return {"netstat", {"-na"}};
     }
 
     QList<Port> usedPorts(const QByteArray &output) const override
@@ -178,7 +176,6 @@ QnxDeviceFactory::QnxDeviceFactory() : IDeviceFactory(Constants::QNX_QNX_OS_TYPE
     setCombinedIcon(":/qnx/images/qnxdevicesmall.png",
                     ":/qnx/images/qnxdevice.png");
     setConstructionFunction(&QnxDevice::create);
-    setCanCreate(true);
     setCreator([] {
         QnxDeviceWizard wizard;
         if (wizard.exec() != QDialog::Accepted)
diff --git a/src/plugins/remotelinux/filesystemaccess_test.cpp b/src/plugins/remotelinux/filesystemaccess_test.cpp
index 9623b6f12d2..2c95a5ca81b 100644
--- a/src/plugins/remotelinux/filesystemaccess_test.cpp
+++ b/src/plugins/remotelinux/filesystemaccess_test.cpp
@@ -52,7 +52,6 @@ TestLinuxDeviceFactory::TestLinuxDeviceFactory()
     setDisplayName("Generic Linux Device");
     setIcon(QIcon());
     setConstructionFunction(&LinuxDevice::create);
-    setCanCreate(true);
     setCreator([] {
         LinuxDevice::Ptr newDev = LinuxDevice::create();
         qDebug() << "device : " << newDev->type();
diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp
index 63f7e0ff72c..7b19d51b2e9 100644
--- a/src/plugins/remotelinux/linuxdevice.cpp
+++ b/src/plugins/remotelinux/linuxdevice.cpp
@@ -146,7 +146,7 @@ private:
 
 class LinuxPortsGatheringMethod : public PortsGatheringMethod
 {
-    Runnable runnable(QAbstractSocket::NetworkLayerProtocol protocol) const override
+    CommandLine commandLine(QAbstractSocket::NetworkLayerProtocol protocol) const override
     {
         // We might encounter the situation that protocol is given IPv6
         // but the consumer of the free port information decides to open
@@ -159,10 +159,8 @@ class LinuxPortsGatheringMethod : public PortsGatheringMethod
         Q_UNUSED(protocol)
 
         // /proc/net/tcp* covers /proc/net/tcp and /proc/net/tcp6
-        Runnable runnable;
-        runnable.command.setExecutable("sed");
-        runnable.command.setArguments("-e 's/.*: [[:xdigit:]]*:\\([[:xdigit:]]\\{4\\}\\).*/\\1/g' /proc/net/tcp*");
-        return runnable;
+        return {"sed", "-e 's/.*: [[:xdigit:]]*:\\([[:xdigit:]]\\{4\\}\\).*/\\1/g' /proc/net/tcp*",
+                CommandLine::Raw};
     }
 
     QList<Utils::Port> usedPorts(const QByteArray &output) const override
@@ -248,7 +246,7 @@ public:
         return ok && result == 0;
     }
 
-    QString outputForRunInShell(const QString &cmd)
+    QByteArray outputForRunInShell(const QString &cmd)
     {
         QTC_ASSERT(m_shell, return {});
 
@@ -272,7 +270,7 @@ public:
         if (pos >= 0)
             output = output.left(pos);
         DEBUG("CHOPPED2 " << output);
-        return QString::fromUtf8(output);
+        return output;
     }
 
     bool isRunning() const { return m_shell; }
@@ -288,10 +286,13 @@ public:
     explicit LinuxDevicePrivate(LinuxDevice *parent);
     ~LinuxDevicePrivate();
 
+    CommandLine fullLocalCommandLine(const CommandLine &remoteCommand,
+                                     QtcProcess::TerminalMode terminalMode,
+                                     bool hasDisplay) const;
     bool setupShell();
     bool runInShell(const CommandLine &cmd, const QByteArray &data = {});
-    QString outputForRunInShell(const QString &cmd);
-    QString outputForRunInShell(const CommandLine &cmd);
+    QByteArray outputForRunInShell(const QString &cmd);
+    QByteArray outputForRunInShell(const CommandLine &cmd);
 
     LinuxDevice *q = nullptr;
     QThread m_shellThread;
@@ -416,9 +417,7 @@ DeviceEnvironmentFetcher::Ptr LinuxDevice::environmentFetcher() const
 
 QString LinuxDevice::userAtHost() const
 {
-    if (sshParameters().userName().isEmpty())
-        return sshParameters().host();
-    return sshParameters().userName() + '@' + sshParameters().host();
+    return sshParameters().userAtHost();
 }
 
 FilePath LinuxDevice::mapToGlobalPath(const FilePath &pathOnDevice) const
@@ -440,9 +439,53 @@ bool LinuxDevice::handlesFile(const FilePath &filePath) const
     return filePath.scheme() == "ssh" && filePath.host() == userAtHost();
 }
 
-void LinuxDevice::runProcess(QtcProcess &) const
+CommandLine LinuxDevicePrivate::fullLocalCommandLine(const CommandLine &remoteCommand,
+                                                     QtcProcess::TerminalMode terminalMode,
+                                                     bool hasDisplay) const
 {
-    QTC_CHECK(false); // FIXME: Implement
+    Utils::CommandLine cmd{SshSettings::sshFilePath()};
+    const SshConnectionParameters parameters = q->sshParameters();
+
+    if (hasDisplay)
+        cmd.addArg("-X");
+    if (terminalMode != QtcProcess::TerminalOff)
+        cmd.addArg("-tt");
+
+    cmd.addArg("-q");
+    // TODO: currently this drops shared connection (-o ControlPath=socketFilePath)
+    cmd.addArgs(parameters.connectionOptions(SshSettings::sshFilePath()) << parameters.host());
+
+    CommandLine remoteWithLocalPath = remoteCommand;
+    FilePath executable = remoteWithLocalPath.executable();
+    executable.setScheme({});
+    executable.setHost({});
+    remoteWithLocalPath.setExecutable(executable);
+    cmd.addArg(remoteWithLocalPath.toUserOutput());
+    return cmd;
+}
+
+void LinuxDevice::runProcess(QtcProcess &process) const
+{
+    QTC_ASSERT(!process.isRunning(), return);
+
+    Utils::Environment env = process.hasEnvironment() ? process.environment()
+                                                      : Utils::Environment::systemEnvironment();
+    const bool hasDisplay = env.hasKey("DISPLAY") && (env.value("DISPLAY") != QString(":0"));
+    if (SshSettings::askpassFilePath().exists()) {
+        env.set("SSH_ASKPASS", SshSettings::askpassFilePath().toUserOutput());
+
+        // OpenSSH only uses the askpass program if DISPLAY is set, regardless of the platform.
+        if (!env.hasKey("DISPLAY"))
+            env.set("DISPLAY", ":0");
+    }
+    process.setEnvironment(env);
+
+    // Otherwise, ssh will ignore SSH_ASKPASS and read from /dev/tty directly.
+    process.setDisableUnixTerminal();
+
+    process.setCommand(d->fullLocalCommandLine(process.commandLine(), process.terminalMode(),
+                                               hasDisplay));
+    process.start();
 }
 
 LinuxDevicePrivate::LinuxDevicePrivate(LinuxDevice *parent)
@@ -485,7 +528,7 @@ bool LinuxDevicePrivate::runInShell(const CommandLine &cmd, const QByteArray &da
     return ret;
 }
 
-QString LinuxDevicePrivate::outputForRunInShell(const QString &cmd)
+QByteArray LinuxDevicePrivate::outputForRunInShell(const QString &cmd)
 {
     QMutexLocker locker(&m_shellMutex);
     DEBUG(cmd);
@@ -494,14 +537,14 @@ QString LinuxDevicePrivate::outputForRunInShell(const QString &cmd)
         QTC_ASSERT(ok, return {});
     }
 
-    QString ret;
+    QByteArray ret;
     QMetaObject::invokeMethod(m_handler, [this, &cmd] {
         return m_handler->outputForRunInShell(cmd);
     }, Qt::BlockingQueuedConnection, &ret);
     return ret;
 }
 
-QString LinuxDevicePrivate::outputForRunInShell(const CommandLine &cmd)
+QByteArray LinuxDevicePrivate::outputForRunInShell(const CommandLine &cmd)
 {
     return outputForRunInShell(cmd.toUserOutput());
 }
@@ -615,7 +658,7 @@ bool LinuxDevice::renameFile(const FilePath &filePath, const FilePath &target) c
 QDateTime LinuxDevice::lastModified(const FilePath &filePath) const
 {
     QTC_ASSERT(handlesFile(filePath), return {});
-    const QString output = d->outputForRunInShell({"stat", {"-c", "%Y", filePath.path()}});
+    const QByteArray output = d->outputForRunInShell({"stat", {"-c", "%Y", filePath.path()}});
     const qint64 secs = output.toLongLong();
     const QDateTime dt = QDateTime::fromSecsSinceEpoch(secs, Qt::UTC);
     return dt;
@@ -624,14 +667,15 @@ QDateTime LinuxDevice::lastModified(const FilePath &filePath) const
 FilePath LinuxDevice::symLinkTarget(const FilePath &filePath) const
 {
     QTC_ASSERT(handlesFile(filePath), return {});
-    const QString output = d->outputForRunInShell({"readlink", {"-n", "-e", filePath.path()}});
-    return output.isEmpty() ? FilePath() : filePath.withNewPath(output);
+    const QByteArray output = d->outputForRunInShell({"readlink", {"-n", "-e", filePath.path()}});
+    const QString out = QString::fromUtf8(output.data(), output.size());
+    return output.isEmpty() ? FilePath() : filePath.withNewPath(out);
 }
 
 qint64 LinuxDevice::fileSize(const FilePath &filePath) const
 {
     QTC_ASSERT(handlesFile(filePath), return -1);
-    const QString output = d->outputForRunInShell({"stat", {"-c", "%s", filePath.path()}});
+    const QByteArray output = d->outputForRunInShell({"stat", {"-c", "%s", filePath.path()}});
     return output.toLongLong();
 }
 
@@ -641,7 +685,7 @@ qint64 LinuxDevice::bytesAvailable(const FilePath &filePath) const
     CommandLine cmd("df", {"-k"});
     cmd.addArg(filePath.path());
     cmd.addArgs("|tail -n 1 |sed 's/  */ /g'|cut -d ' ' -f 4", CommandLine::Raw);
-    const QString output = d->outputForRunInShell(cmd.toUserOutput());
+    const QByteArray output = d->outputForRunInShell(cmd.toUserOutput());
     bool ok = false;
     const qint64 size = output.toLongLong(&ok);
     if (ok)
@@ -652,7 +696,7 @@ qint64 LinuxDevice::bytesAvailable(const FilePath &filePath) const
 QFileDevice::Permissions LinuxDevice::permissions(const FilePath &filePath) const
 {
     QTC_ASSERT(handlesFile(filePath), return {});
-    const QString output = d->outputForRunInShell({"stat", {"-c", "%a", filePath.path()}});
+    const QByteArray output = d->outputForRunInShell({"stat", {"-c", "%a", filePath.path()}});
     const uint bits = output.toUInt(nullptr, 8);
     QFileDevice::Permissions perm = {};
 #define BIT(n, p) if (bits & (1<<n)) perm |= QFileDevice::p
@@ -716,8 +760,9 @@ void LinuxDevice::iterateDirectory(const FilePath &filePath,
 {
     QTC_ASSERT(handlesFile(filePath), return);
     // if we do not have find - use ls as fallback
-    const QString output = d->outputForRunInShell({"ls", {"-1", "-b", "--", filePath.path()}});
-    const QStringList entries = output.split('\n', Qt::SkipEmptyParts);
+    const QByteArray output = d->outputForRunInShell({"ls", {"-1", "-b", "--", filePath.path()}});
+    const QString out = QString::fromUtf8(output.data(), output.size());
+    const QStringList entries = out.split('\n', Qt::SkipEmptyParts);
     filterEntriesHelper(filePath, callBack, entries, filter);
 }
 
@@ -731,9 +776,9 @@ QByteArray LinuxDevice::fileContents(const FilePath &filePath, qint64 limit, qin
     }
     CommandLine cmd(FilePath::fromString("dd"), args, CommandLine::Raw);
 
-    const QString output = d->outputForRunInShell(cmd);
-    DEBUG(output << output.toLatin1() << QByteArray::fromHex(output.toLatin1()));
-    return output.toLatin1();
+    const QByteArray output = d->outputForRunInShell(cmd);
+    DEBUG(output << output << QByteArray::fromHex(output));
+    return output;
 }
 
 bool LinuxDevice::writeFileContents(const FilePath &filePath, const QByteArray &data) const
@@ -755,7 +800,6 @@ LinuxDeviceFactory::LinuxDeviceFactory()
     setDisplayName(LinuxDevice::tr("Generic Linux Device"));
     setIcon(QIcon());
     setConstructionFunction(&LinuxDevice::create);
-    setCanCreate(true);
     setCreator([] {
         GenericLinuxDeviceConfigurationWizard wizard(Core::ICore::dialogParent());
         if (wizard.exec() != QDialog::Accepted)
diff --git a/src/plugins/remotelinux/linuxdevice.h b/src/plugins/remotelinux/linuxdevice.h
index d914e8b223b..d2906b230c3 100644
--- a/src/plugins/remotelinux/linuxdevice.h
+++ b/src/plugins/remotelinux/linuxdevice.h
@@ -82,7 +82,7 @@ public:
     QByteArray fileContents(const Utils::FilePath &filePath, qint64 limit, qint64 offset) const override;
     bool writeFileContents(const Utils::FilePath &filePath, const QByteArray &data) const override;
     QDateTime lastModified(const Utils::FilePath &filePath) const override;
-    void runProcess(Utils::QtcProcess &) const override;
+    void runProcess(Utils::QtcProcess &process) const override;
     qint64 fileSize(const Utils::FilePath &filePath) const override;
     qint64 bytesAvailable(const Utils::FilePath &filePath) const override;
     QFileDevice::Permissions permissions(const Utils::FilePath &filePath) const override;
diff --git a/src/plugins/studiowelcome/studiowelcome.qbs b/src/plugins/studiowelcome/studiowelcome.qbs
index efb5c64e4f8..afc9e627a52 100644
--- a/src/plugins/studiowelcome/studiowelcome.qbs
+++ b/src/plugins/studiowelcome/studiowelcome.qbs
@@ -10,6 +10,7 @@ QtcPlugin {
     Depends { name: "ProjectExplorer" }
     Depends { name: "QtSupport" }
     Depends { name: "QmlDesigner" }
+    Depends { name: "QmlProjectManager" }
     Depends { name: "app_version_header" }
 
     cpp.defines: 'STUDIO_QML_PATH="' + FileInfo.joinPaths(sourceDirectory, "qml") + '"'
diff --git a/src/plugins/studiowelcome/studiowelcomeplugin.cpp b/src/plugins/studiowelcome/studiowelcomeplugin.cpp
index 9ba6ed9b808..6e84db4f9b3 100644
--- a/src/plugins/studiowelcome/studiowelcomeplugin.cpp
+++ b/src/plugins/studiowelcome/studiowelcomeplugin.cpp
@@ -41,9 +41,12 @@
 #include <extensionsystem/pluginmanager.h>
 #include <extensionsystem/pluginspec.h>
 
+#include <projectexplorer/jsonwizard/jsonwizardfactory.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectmanager.h>
 
+#include <qmlprojectmanager/qmlproject.h>
+
 #include <qmldesigner/qmldesignerplugin.h>
 #include <qmldesigner/components/componentcore/theme.h>
 
@@ -580,9 +583,14 @@ void StudioWelcomePlugin::extensionsInitialized()
 {
     Core::ModeManager::activateMode(m_welcomeMode->id());
 
-    // Enable QDS new project dialog
-    if (Core::ICore::settings()->value("QML/Designer/StandAloneMode", false).toBool())
+    // Enable QDS new project dialog and QDS wizards
+    if (QmlProjectManager::QmlProject::isQtDesignStudio()) {
+        ProjectExplorer::JsonWizardFactory::clearWizardPaths();
+        ProjectExplorer::JsonWizardFactory::addWizardPath(
+            Core::ICore::resourcePath("qmldesigner/studio_templates"));
+
         Core::ICore::setNewDialogFactory([](QWidget *parent) { return new QdsNewDialog(parent); });
+    }
 
     if (showSplashScreen()) {
         connect(Core::ICore::instance(), &Core::ICore::coreOpened, this, [this] {
diff --git a/src/plugins/texteditor/codeassist/codeassistant.cpp b/src/plugins/texteditor/codeassist/codeassistant.cpp
index 8e5f1471bde..d16ad59146f 100644
--- a/src/plugins/texteditor/codeassist/codeassistant.cpp
+++ b/src/plugins/texteditor/codeassist/codeassistant.cpp
@@ -441,6 +441,7 @@ void CodeAssistantPrivate::invalidateCurrentRequestData()
     m_asyncProcessor = nullptr;
     m_requestRunner = nullptr;
     m_requestProvider = nullptr;
+    m_receivedContentWhileWaiting = false;
 }
 
 CompletionAssistProvider *CodeAssistantPrivate::identifyActivationSequence()
diff --git a/src/plugins/texteditor/textstyles.h b/src/plugins/texteditor/textstyles.h
index bf6d04eb995..41bfbff5474 100644
--- a/src/plugins/texteditor/textstyles.h
+++ b/src/plugins/texteditor/textstyles.h
@@ -29,11 +29,13 @@
 
 #include <utils/sizedarray.h>
 
+#include <QList>
+
 namespace TextEditor {
 using MixinTextStyles = Utils::SizedArray<TextStyle, 6>;
 
 struct TextStyles {
-    TextStyle mainStyle;
+    TextStyle mainStyle = C_TEXT;
     MixinTextStyles mixinStyles;
 
     static TextStyles mixinStyle(TextStyle main, const QList<TextStyle> &mixins)
diff --git a/src/plugins/webassembly/webassemblydevice.cpp b/src/plugins/webassembly/webassemblydevice.cpp
index 2e1eb31180d..ae9fb02ae3e 100644
--- a/src/plugins/webassembly/webassemblydevice.cpp
+++ b/src/plugins/webassembly/webassemblydevice.cpp
@@ -59,7 +59,6 @@ WebAssemblyDeviceFactory::WebAssemblyDeviceFactory()
     setCombinedIcon(":/webassembly/images/webassemblydevicesmall.png",
                     ":/webassembly/images/webassemblydevice.png");
     setConstructionFunction(&WebAssemblyDevice::create);
-    setCanCreate(true);
     setCreator(&WebAssemblyDevice::create);
 }
 
diff --git a/src/tools/sdktool/CMakeLists.txt b/src/tools/sdktool/CMakeLists.txt
index 7726969b307..0161cc2c2ed 100644
--- a/src/tools/sdktool/CMakeLists.txt
+++ b/src/tools/sdktool/CMakeLists.txt
@@ -25,15 +25,6 @@ find_package(Qt5
   REQUIRED
 )
 
-if (MSVC)
-  # find out if Qt is static and set /MT if so
-  get_target_property(_input_type Qt5::Core TYPE)
-  if (${_input_type} STREQUAL "STATIC_LIBRARY")
-    string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
-    string(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
-  endif()
-endif()
-
 if (APPLE)
   find_library(FWFoundation Foundation)
 endif()
@@ -74,6 +65,14 @@ add_qtc_executable(sdktool
     settings.cpp settings.h
 )
 
+if (MSVC AND TARGET sdktool)
+  # find out if Qt is static and set /MT if so
+  get_target_property(_input_type Qt5::Core TYPE)
+  if (${_input_type} STREQUAL "STATIC_LIBRARY")
+    set_property(TARGET sdktool PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+  endif()
+endif()
+
 extend_qtc_executable(sdktool
   SOURCES_PREFIX "${UtilsSourcesDir}"
   DEFINES QTCREATOR_UTILS_STATIC_LIB
diff --git a/tests/auto/android/CMakeLists.txt b/tests/auto/android/CMakeLists.txt
index bf132fe599a..8f328fe98e2 100644
--- a/tests/auto/android/CMakeLists.txt
+++ b/tests/auto/android/CMakeLists.txt
@@ -1,6 +1,5 @@
 add_qtc_test(tst_avdmanageroutputparser
   DEPENDS Utils
-  PLUGIN_DEPENDS Android
   INCLUDES
     "${PROJECT_SOURCE_DIR}/src/plugins"
     "${PROJECT_SOURCE_DIR}/src/plugins/android"
@@ -10,8 +9,6 @@ add_qtc_test(tst_avdmanageroutputparser
     "${PROJECT_SOURCE_DIR}/src/plugins/android/avdmanageroutputparser.h"
     "${PROJECT_SOURCE_DIR}/src/plugins/android/androiddeviceinfo.cpp"
     "${PROJECT_SOURCE_DIR}/src/plugins/android/androiddeviceinfo.h"
-    "${PROJECT_SOURCE_DIR}/src/plugins/android/androidmanager.cpp"
-    "${PROJECT_SOURCE_DIR}/src/plugins/android/androidmanager.h"
 )
 
 qtc_add_resources(tst_avdmanageroutputparser tst_avdmanageroutputparser_rcc
diff --git a/tests/auto/qml/qmldesigner/wizard/CMakeLists.txt b/tests/auto/qml/qmldesigner/wizard/CMakeLists.txt
index de84a6e931e..0606be1a550 100644
--- a/tests/auto/qml/qmldesigner/wizard/CMakeLists.txt
+++ b/tests/auto/qml/qmldesigner/wizard/CMakeLists.txt
@@ -9,11 +9,11 @@ add_qtc_test(tst_qml_wizard
   DEFINES
     QT_CREATOR
     QMLDESIGNER_TEST
-  INCLUDES "${PROJECT_SOURCE_DIR}/src/plugins"
-           "${StudioWelcomeDir}"
     IDE_PLUGIN_PATH="${PROJECT_BINARY_DIR}/${IDE_PLUGIN_PATH}"
     IDE_DATA_PATH="${PROJECT_BINARY_DIR}/${IDE_DATA_PATH}"
     TESTSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}"
+  INCLUDES "${PROJECT_SOURCE_DIR}/src/plugins"
+           "${StudioWelcomeDir}"
   SOURCES
     wizardfactories-test.cpp
     stylemodel-test.cpp
diff --git a/tests/manual/debugger/gui/gui.qbs b/tests/manual/debugger/gui/gui.qbs
new file mode 100644
index 00000000000..7a464f77c17
--- /dev/null
+++ b/tests/manual/debugger/gui/gui.qbs
@@ -0,0 +1,13 @@
+QtApplication {
+    name: "Manual debugger gui test"
+    Depends { name: "Qt.widgets" }
+
+    files: [
+        "mainwindow.cpp",
+        "mainwindow.h",
+        "mainwindow.ui",
+        "tst_gui.cpp",
+    ]
+
+    install: false
+}
diff --git a/tests/manual/debugger/simple/simple.qbs b/tests/manual/debugger/simple/simple.qbs
new file mode 100644
index 00000000000..c05ef68ac8a
--- /dev/null
+++ b/tests/manual/debugger/simple/simple.qbs
@@ -0,0 +1,13 @@
+import qbs
+import qbs.FileInfo
+
+Project {
+    name: "Manual debugger simple tests"
+
+    condition: project.withAutotests
+
+    references: [
+        "simple_test_app.qbs",
+        "simple_test_plugin.qbs"
+    ]
+}
diff --git a/tests/manual/debugger/simple/simple_test_app.qbs b/tests/manual/debugger/simple/simple_test_app.qbs
new file mode 100644
index 00000000000..59cf3fe3074
--- /dev/null
+++ b/tests/manual/debugger/simple/simple_test_app.qbs
@@ -0,0 +1,73 @@
+import qbs.File
+import qbs.FileInfo
+
+CppApplication {
+    name: "Manual Test Simple Application"
+    targetName: "simple_test_app"
+
+    Depends { name: "Qt.core" }
+    Depends { name: "Qt.core-private"; required: false; condition: Qt.core.versionMajor > 4 }
+    Depends { name: "Qt.core5compat"; condition: Qt.core.versionMajor > 5 }
+    Depends { name: "Qt.gui" }
+    Depends { name: "Qt.xml"; condition: Qt.core.versionMajor < 6 }
+    Depends { name: "Qt.widgets"; condition: Qt.core.versionMajor > 4 }
+    Depends { name: "Qt.network" }
+    Depends { name: "Qt.script"; required: false }
+    Depends { name: "Qt.webkit"; required: false }
+    Depends { name: "Qt.webkitwidgets"; required: false; condition: Qt.core.versionMajor > 4 }
+
+    cpp.cxxLanguageVersion: "c++11"
+
+    cpp.defines: {
+        var additional = ["USE_GUILIB"];
+
+        if (File.exists("/usr/include/boost/optional.hpp"))
+            additional = additional.concat(["HAS_BOOST"]);
+
+        if (File.exists("/usr/include/eigen2/Eigen/Core") || File.exists("/usr/local/include/eigen2/Eigen/Core"))
+            additional = additional.concat(["HAS_EIGEN2"]);
+        if (File.exists("/usr/include/eigen3/Eigen/Core") || File.exists("/usr/local/include/eigen3/Eigen/Core"))
+            additional = additional.concat(["HAS_EIGEN3"]);
+
+        if (Qt.core.versionMajor > 4)
+            additional = additional.concat(["HAS_PRIVATE"]);
+
+        if (Qt.script.present)
+            additional = additional.concat(["HAS_SCRIPT"]);
+
+        if (qbs.toolchain.contains("msvc"))
+            additional = additional.concat(["_CRT_SECURE_NO_WARNINGS"]);
+
+        /* use following for semi-automated testing */
+        /* additional.concat(["USE_AUTORUN=1"]); */
+
+        return additional;
+    }
+
+    cpp.includePaths: {
+        var additional = [];
+
+        if (File.exists("/usr/include/eigen2/Eigen/Core"))
+            additional = additional.concat(["/usr/include/eigen2"]);
+        if (File.exists("/usr/include/eigen3/Eigen/Core"))
+            additional = additional.concat(["/usr/include/eigen3"]);
+        if (File.exists("/usr/local/include/eigen2/Eigen/Core"))
+            additional.concat(["/usr/local/include/eigen2"]);
+        if (File.exists("/usr/local/include/eigen3/Eigen/Core"))
+            additional = additional.concat(["/usr/include/eigen3"]);
+
+        return additional;
+    }
+
+    files: [
+        "simple_test_app.cpp"
+    ]
+
+    destinationDirectory: FileInfo.joinPaths(
+                              FileInfo.path(project.buildDirectory + '/'
+                                            + FileInfo.relativePath(project.ide_source_tree,
+                                                                    sourceDirectory)),
+                              "simple")
+
+    install: false
+}
diff --git a/tests/manual/debugger/simple/simple_test_plugin.qbs b/tests/manual/debugger/simple/simple_test_plugin.qbs
new file mode 100644
index 00000000000..33f257c449b
--- /dev/null
+++ b/tests/manual/debugger/simple/simple_test_plugin.qbs
@@ -0,0 +1,16 @@
+import qbs.FileInfo
+
+DynamicLibrary {
+    name: "Manual Test Simple Plugin"
+    targetName: "simple_test_plugin"
+
+    Depends { name: "Qt.core" }
+
+    files: [ "simple_test_plugin.cpp" ]
+
+    destinationDirectory: FileInfo.joinPaths(
+                              FileInfo.path(project.buildDirectory + '/'
+                                            + FileInfo.relativePath(project.ide_source_tree,
+                                                                    sourceDirectory)),
+                              "simple")
+}
diff --git a/tests/manual/fakevim/fakevim.qbs b/tests/manual/fakevim/fakevim.qbs
new file mode 100644
index 00000000000..77e7253830a
--- /dev/null
+++ b/tests/manual/fakevim/fakevim.qbs
@@ -0,0 +1,29 @@
+import qbs.FileInfo
+
+QtcManualtest {
+    name: "Manual FakeVim test"
+    type: ["application"]
+
+    Depends { name: "Utils" }
+
+    property string fakeVimDir: FileInfo.joinPaths(project.ide_source_tree, "src", "plugins", "fakevim")
+
+    cpp.defines: base.concat(["FAKEVIM_STANDALONE"])
+    cpp.includePaths: fakeVimDir
+
+    files: [
+        "main.cpp"
+    ]
+
+    Group {
+        name: "FakeVim files"
+
+        prefix: fakeVimDir + "/"
+        files: [
+            "fakevimactions.cpp",
+            "fakevimactions.h",
+            "fakevimhandler.cpp",
+            "fakevimhandler.h",
+        ]
+    }
+}
diff --git a/tests/manual/manual.qbs b/tests/manual/manual.qbs
index d79742c5f03..5a5bddbf29d 100644
--- a/tests/manual/manual.qbs
+++ b/tests/manual/manual.qbs
@@ -6,6 +6,15 @@ Project {
     condition: project.withAutotests
 
     references: [
+        "debugger/gui/gui.qbs",
+        "debugger/simple/simple.qbs",
+        "fakevim/fakevim.qbs",
+        "pluginview/pluginview.qbs",
+        "process/process.qbs",
+        "proparser/testreader.qbs",
+        "shootout/shootout.qbs",
+        "ssh/shell/shell.qbs",
+        "ssh/sftpfsmodel/sftpfsmodel.qbs",
         "widgets/widgets.qbs",
     ]
 }
diff --git a/tests/manual/pluginview/plugindialog.cpp b/tests/manual/pluginview/plugindialog.cpp
index 550852ed529..9a0af5d449e 100644
--- a/tests/manual/pluginview/plugindialog.cpp
+++ b/tests/manual/pluginview/plugindialog.cpp
@@ -129,6 +129,8 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
     ExtensionSystem::PluginManager manager;
+    manager.setSettings(new QtcSettings);
+
     manager.setPluginIID(QLatin1String("plugin"));
     setCreatorTheme(new Theme("default", &app));
     QObject::connect(&app, &QCoreApplication::aboutToQuit,
diff --git a/tests/manual/pluginview/plugins/plugin1/plugin1.qbs b/tests/manual/pluginview/plugins/plugin1/plugin1.qbs
new file mode 100644
index 00000000000..631d08088d3
--- /dev/null
+++ b/tests/manual/pluginview/plugins/plugin1/plugin1.qbs
@@ -0,0 +1,14 @@
+QtcManualtest {
+    name: "Manual test plugin1"
+    targetName: "plugin1"
+    type: [ "dynamiclibrary" ]
+
+    Depends { name: "ExtensionSystem" }
+    Depends { name: "Manual test plugin2"}
+    Depends { name: "Manual test plugin3"}
+
+    files: [
+        "plugin1.cpp",
+        "plugin1.h"
+    ]
+}
diff --git a/tests/manual/pluginview/plugins/plugin2/plugin2.qbs b/tests/manual/pluginview/plugins/plugin2/plugin2.qbs
new file mode 100644
index 00000000000..f2cb5036f1b
--- /dev/null
+++ b/tests/manual/pluginview/plugins/plugin2/plugin2.qbs
@@ -0,0 +1,12 @@
+QtcManualtest {
+    name: "Manual test plugin2"
+    targetName: "plugin2"
+    type: [ "dynamiclibrary" ]
+
+    Depends { name: "ExtensionSystem" }
+
+    files: [
+        "plugin2.cpp",
+        "plugin2.h"
+    ]
+}
diff --git a/tests/manual/pluginview/plugins/plugin3/plugin3.qbs b/tests/manual/pluginview/plugins/plugin3/plugin3.qbs
new file mode 100644
index 00000000000..884b850c6f9
--- /dev/null
+++ b/tests/manual/pluginview/plugins/plugin3/plugin3.qbs
@@ -0,0 +1,13 @@
+QtcManualtest {
+    name: "Manual test plugin3"
+    targetName: "plugin3"
+    type: [ "dynamiclibrary" ]
+
+    Depends { name: "ExtensionSystem" }
+    Depends { name: "Manual test plugin2" }
+
+    files: [
+        "plugin3.cpp",
+        "plugin3.h"
+    ]
+}
diff --git a/tests/manual/pluginview/pluginview.qbs b/tests/manual/pluginview/pluginview.qbs
new file mode 100644
index 00000000000..e7ea64bf5be
--- /dev/null
+++ b/tests/manual/pluginview/pluginview.qbs
@@ -0,0 +1,21 @@
+Project {
+    name: "Manual plugin test"
+
+    QtcManualtest {
+        name: "Manual plugin view test"
+
+        Depends { name: "ExtensionSystem" }
+        Depends { name: "Utils" }
+
+        files: [
+            "plugindialog.cpp",
+            "plugindialog.h"
+        ]
+    }
+
+    references: [
+        "plugins/plugin1/plugin1.qbs",
+        "plugins/plugin2/plugin2.qbs",
+        "plugins/plugin3/plugin3.qbs",
+    ]
+}
diff --git a/tests/manual/process/process.qbs b/tests/manual/process/process.qbs
new file mode 100644
index 00000000000..41302a2a724
--- /dev/null
+++ b/tests/manual/process/process.qbs
@@ -0,0 +1,14 @@
+import qbs
+
+QtcManualtest {
+    name: "Manual QtcProcess test"
+    condition: qbs.targetOS.contains("unix")
+    Depends { name: "Utils" }
+    targetName: "process"
+
+    files: [
+        "main.cpp",
+        "mainwindow.cpp",
+        "mainwindow.h"
+    ]
+}
diff --git a/tests/manual/proparser/main.cpp b/tests/manual/proparser/main.cpp
index 74710314902..aed9eefc8d3 100644
--- a/tests/manual/proparser/main.cpp
+++ b/tests/manual/proparser/main.cpp
@@ -142,8 +142,13 @@ int main(int argc, char **argv)
 
     QMakeGlobals option;
     QString qmake = QString::fromLocal8Bit(qgetenv("TESTREADER_QMAKE"));
-    if (qmake.isEmpty())
+    if (qmake.isEmpty()) {
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
         qmake = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/qmake");
+#else
+        qmake = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmake");
+#endif
+    }
     option.qmake_abslocation = QDir::cleanPath(qmake);
     option.initProperties();
 
diff --git a/tests/manual/proparser/testreader.qbs b/tests/manual/proparser/testreader.qbs
new file mode 100644
index 00000000000..0bc7b9387f3
--- /dev/null
+++ b/tests/manual/proparser/testreader.qbs
@@ -0,0 +1,61 @@
+QtcManualtest {
+    name: "Manual ProParser test"
+    Depends { name: "Qt.core" }
+
+    cpp.includePaths: base.concat(["../../../src/shared/proparser/",
+                                   "../../../src/libs/"])
+
+    cpp.defines: ["QMAKE_BUILTIN_PRFS",
+                  "QT_NO_CAST_TO_ASCII",
+                  "QT_RESTRICTED_CAST_FROM_ASCII",
+                  "QT_USE_QSTRINGBUILDER",
+                  "PROEVALUATOR_FULL",
+                  "PROEVALUATOR_CUMULATIVE",
+                  "PROEVALUATOR_INIT_PROPS"]
+
+    Properties {
+        condition: qbs.targetOS.contains("windows")
+        cpp.dynamicLibraries: "advapi32"
+    }
+
+    files: [
+        "main.cpp",
+    ]
+
+    Group {
+        name: "ProParser files"
+        prefix: "../../../src/shared/proparser/"
+
+        files: [
+            "ioutils.cpp",
+            "ioutils.h",
+            "profileevaluator.cpp",
+            "profileevaluator.h",
+            "proitems.cpp",
+            "proitems.h",
+            "proparser.qrc",
+            "qmake_global.h",
+            "qmakebuiltins.cpp",
+            "qmakeevaluator.cpp",
+            "qmakeevaluator.h",
+            "qmakeevaluator_p.h",
+            "qmakeglobals.cpp",
+            "qmakeglobals.h",
+            "qmakeparser.cpp",
+            "qmakeparser.h",
+            "qmakevfs.cpp",
+            "qmakevfs.h",
+            "registry.cpp",
+            "registry_p.h",
+        ]
+    }
+
+    Group {
+        name: "Porting Helper"
+        prefix: "../../../src/libs/utils/"
+
+        files: [
+            "porting.h"
+        ]
+    }
+}
diff --git a/tests/manual/shootout/shootout.qbs b/tests/manual/shootout/shootout.qbs
new file mode 100644
index 00000000000..85626c5b0d8
--- /dev/null
+++ b/tests/manual/shootout/shootout.qbs
@@ -0,0 +1,7 @@
+QtcManualtest {
+    name: "Manual debugger shootout test"
+
+    files: [
+        "tst_codesize.cpp",
+    ]
+}
diff --git a/tests/manual/shootout/tst_codesize.cpp b/tests/manual/shootout/tst_codesize.cpp
index 630053987f1..738d3b032c3 100644
--- a/tests/manual/shootout/tst_codesize.cpp
+++ b/tests/manual/shootout/tst_codesize.cpp
@@ -72,7 +72,7 @@ struct TempStuff
 {
     TempStuff() : buildTemp(QLatin1String("qt_tst_codesize"))
     {
-        buildPath = QDir::currentPath() + QLatin1Char('/')  + buildTemp.path();
+        buildPath = buildTemp.path();
         buildTemp.setAutoRemove(false);
         QVERIFY(!buildPath.isEmpty());
     }
@@ -214,9 +214,8 @@ void tst_CodeSize::codesize()
 
     QProcess qmake;
     qmake.setWorkingDirectory(t->buildPath);
-    QString cmd = QString::fromLatin1(m_qmakeBinary + " -r doit.pro");
-    qDebug() << "Starting qmake: " << cmd;
-    qmake.start(cmd);
+    qDebug() << "Starting qmake: " << QString::fromLatin1(m_qmakeBinary + " -r doit.pro");
+    qmake.start(QString::fromLatin1(m_qmakeBinary), {"-r", "doit.pro"});
 //    QVERIFY(qmake.waitForFinished());
     qmake.waitForFinished();
     QByteArray output = qmake.readAllStandardOutput();
@@ -255,20 +254,24 @@ void tst_CodeSize::codesize()
              << "\nExtra CXX Flags: " << c.extraCxxFlags.data();
 #ifdef Q_OS_WIN
 #    ifdef Q_CC_MSVC
-        QByteArray finalCommand = suite.cmd + ' ' + "release\\" + c.file + ".obj";
+        QString arguments = "release\\" + c.file + ".obj";
 #    else
-        QByteArray finalCommand = suite.cmd + ' ' + "release\\" + c.file + ".o";
+        QString arguments = "release\\" + c.file + ".o";
 #    endif
 #else
-        QByteArray finalCommand = suite.cmd + ' ' + c.file + ".o";
+        QString arguments = QString(c.file + ".o");
 #endif
+        const int index = suite.cmd.indexOf(' ');
+        QString command = suite.cmd.left(index);
+        arguments = QString::fromLatin1(suite.cmd.mid(index + 1)) + arguments;
         QProcess final;
         final.setWorkingDirectory(t->buildPath);
         final.setProcessEnvironment(m_env);
-        cout << "\nCommand:         " << finalCommand.data()
+        cout << "\nCommand:         " << suite.cmd.data() << arguments.data()
              << "\n\n--------------------- OUTPUT " << suiteCount << '.' << i << ' '
              << " ---------------------------------\n\n";
-        final.start(finalCommand);
+
+        final.start(command, arguments.split(' '));
         QVERIFY(final.waitForFinished());
         QByteArray stdOut = final.readAllStandardOutput();
         QByteArray stdErr = final.readAllStandardError();
diff --git a/tests/manual/ssh/sftpfsmodel/sftpfsmodel.qbs b/tests/manual/ssh/sftpfsmodel/sftpfsmodel.qbs
new file mode 100644
index 00000000000..1216d806ec1
--- /dev/null
+++ b/tests/manual/ssh/sftpfsmodel/sftpfsmodel.qbs
@@ -0,0 +1,38 @@
+import qbs
+import qbs.FileInfo
+
+QtcManualtest {
+    name: "Manual sftpfs model test"
+    condition: qbs.targetOS.contains("unix")
+    Depends { name: "Utils" }
+    Depends { name: "QtcSsh" }
+    Depends { name: "Qt.widgets" }
+
+    cpp.includePaths: [ "../../../../src/shared/modeltest" ]
+
+    cpp.defines: {
+        var defines = base;
+        var absLibExecPath = FileInfo.joinPaths(qbs.installRoot, qbs.installPrefix,
+                                                qtc.ide_libexec_path);
+        var relLibExecPath = FileInfo.relativePath(destinationDirectory, absLibExecPath);
+        defines.push('TEST_RELATIVE_LIBEXEC_PATH="' + relLibExecPath + '"');
+        return defines;
+    }
+
+    files: [
+        "main.cpp",
+        "window.cpp",
+        "window.h",
+        "window.ui",
+    ]
+
+    Group {
+        name: "Model test files"
+        prefix: "../../../../src/shared/modeltest/"
+
+        files: [
+            "modeltest.cpp",
+            "modeltest.h"
+        ]
+    }
+}
diff --git a/tests/manual/ssh/shell/argumentscollector.cpp b/tests/manual/ssh/shell/argumentscollector.cpp
index 1a34b4e53df..e9e7e61888b 100644
--- a/tests/manual/ssh/shell/argumentscollector.cpp
+++ b/tests/manual/ssh/shell/argumentscollector.cpp
@@ -58,7 +58,8 @@ SshConnectionParameters ArgumentsCollector::collect(bool &success) const
             } else if (checkAndSetIntArg(pos, port, portGiven, "-p")
                        || checkAndSetIntArg(pos, parameters.timeout, timeoutGiven, "-t")) {
                 continue;
-            } else  if (checkAndSetStringArg(pos, parameters.privateKeyFile, "-k")) {
+            } else  if (checkAndSetStringArg(pos, str, "-k")) {
+                parameters.privateKeyFile = Utils::FilePath::fromString(str);
                 parameters.authenticationType
                         = SshConnectionParameters::AuthenticationTypeSpecificKey;
                 authTypeGiven = true;
diff --git a/tests/manual/ssh/shell/shell.cpp b/tests/manual/ssh/shell/shell.cpp
index 85f639faf0e..a588a17c908 100644
--- a/tests/manual/ssh/shell/shell.cpp
+++ b/tests/manual/ssh/shell/shell.cpp
@@ -42,7 +42,6 @@ Shell::Shell(const SshConnectionParameters &parameters, QObject *parent)
       m_stdin(new QFile(this))
 {
     connect(m_connection, &SshConnection::connected, this, &Shell::handleConnected);
-    connect(m_connection, &SshConnection::dataAvailable, this, &Shell::handleShellMessage);
     connect(m_connection, &SshConnection::errorOccurred, this, &Shell::handleConnectionError);
 }
 
@@ -68,11 +67,6 @@ void Shell::handleConnectionError()
     QCoreApplication::exit(EXIT_FAILURE);
 }
 
-void Shell::handleShellMessage(const QString &message)
-{
-    std::cout << qPrintable(message);
-}
-
 void Shell::handleConnected()
 {
     m_shell = m_connection->createRemoteShell();
diff --git a/tests/manual/ssh/shell/shell.qbs b/tests/manual/ssh/shell/shell.qbs
new file mode 100644
index 00000000000..e2308fc7d0a
--- /dev/null
+++ b/tests/manual/ssh/shell/shell.qbs
@@ -0,0 +1,17 @@
+import qbs
+
+QtcManualtest {
+    name: "Manual ssh shell test"
+    condition: qbs.targetOS.contains("unix")
+    Depends { name: "Utils" }
+    Depends { name: "QtcSsh" }
+    Depends { name: "Qt.network" }
+
+    files: [
+        "argumentscollector.cpp",
+        "argumentscollector.h",
+        "main.cpp",
+        "shell.cpp",
+        "shell.h",
+    ]
+}